From: Ivo Ugrina <ivo@iugrina.com>
Date: Fri, 7 Oct 2011 12:31:34 +0000 (+0200)
Subject: remove merge leftovers
X-Git-Tag: 0.1~1263^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c722f06a8a6a79f89ece725caa84cbfd7bdaf28c;p=fdroidserver.git

remove merge leftovers
---

diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt
index b826203e..0152e190 100644
--- 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