Cleanup

KristofMorva · Aug 31, 2014 · 0704bf8 · 0704bf8
1 parent 2423435
commit 0704bf8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,14 +1,6 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
 # Standard to msysgit
 *.doc	 diff=astextplain
 *.DOC	 diff=astextplain

diff --git a/gd34emrs.iy3.txt b/gd34emrs.iy3.txt