We really want unix style line endings for most of our files

adding an extra dir to clean for python builds
sbatururimi · Feb 19, 2013 · e890401 · e890401
1 parent b190fb6
commit e890401
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,10 +2,10 @@
 *        text=auto
 
 *.cs     text diff=csharp
-*.java   text diff=java
-*.html   text diff=html
-*.css    text
-*.js     text
+*.java   text diff=java eol=lf
+*.html   text diff=html eol=lf
+*.css    text eol=lf
+*.js     text eol=lf
 *.sql    text
 
 *.csproj text merge=union

diff --git a/Rakefile b/Rakefile
@@ -274,6 +274,7 @@ task :clean do
   rm_rf 'android/libs/'
   rm_rf 'android/client/bin/'
   rm_rf 'java/client/build/'
+  rm_rf 'dist/'
   Android::Clean.new()
 end