remove merge leftovers

diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index b826203e97a66157bd8271bebdb3cbe3dd0faed2..0152e190268420a2a4fe743246558ea34b68ee8f 100644 (file)
--- a/metadata/info.staticfree.android.units.txt
+++ b/metadata/info.staticfree.android.units.txt
@@ -14,10 +14,5 @@ Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
 Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
 Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,target=android-10
 
-
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
 Market Version:1.0
 Market Version Code:9