From ce8e21c8891e95b1c6622499260c533e121508db Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Thu, 30 Aug 2012 14:38:42 +0100
Subject: [PATCH] merge

---
 metadata/apps.droidnotify.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index a95969772c..7d70ccb5bb 100644
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -23,14 +23,8 @@ Build Version:3.1,34,!No source code
 Build Version:3.4,37,!No source code - https://code.google.com/p/droid-notify/issues/detail?id=115
 Build Version:3.7,40,!No source code
 Build Version:3.12,45,!No source code
-<<<<<<< HEAD
 Build Version:3.17,50,!No source code for libraries
 
-=======
-
-#need ambilwarna lib
-#Build Version:3.16,49,990
->>>>>>> 9bb85fccb9b6c6d6f17346dad573201a1f566f4a
 Update Check Mode:Market
 Current Version:3.17
 Current Version Code:50