Merge branch '2.0'

orchestral · Jul 8, 2013 · dd179d4 · dd179d4
2 parents 1e403dd + 40f994e
commit dd179d4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,6 @@
 * text=auto
 
 # Ignore following folder/file.
-
 /build              export-ignore
 /tests              export-ignore
 /.coveralls.yml     export-ignore