Handles when a merge fails and the track is deleted

2013-10-10 11:07:09 -07:00
commit 134c54ca03
1115 changed files with 75040 additions and 0 deletions
@@ -0,0 +1,11 @@
+syntax:glob
+
+*/bin
+*/gen/**
+*/proguard/**
+.metadata
+MyTracksTest/AnnotationProcessor.log
+**/*.pyc
+**/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log