Handles when a merge fails and the track is deleted

This commit is contained in:
Jimmy Shih
2013-10-10 11:07:09 -07:00
commit 134c54ca03
1115 changed files with 75040 additions and 0 deletions
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6