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,4 @@
+#Fri Oct 21 20:06:42 BRST 2011
+eclipse.preferences.version=1
+formatter_profile=_MyTracks
+formatter_settings_version=12