From 902658dc304d77a587157c45327ec640c667aa2f Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Sun, 20 Jan 2013 15:30:45 +0000 Subject: [PATCH] Fix badly resolved merge --- metadata/dentex.youtube.downloader.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/metadata/dentex.youtube.downloader.txt b/metadata/dentex.youtube.downloader.txt index 45a9cd5916..fb77e7eae1 100644 --- a/metadata/dentex.youtube.downloader.txt +++ b/metadata/dentex.youtube.downloader.txt @@ -14,12 +14,6 @@ you can send it via ssh to another computer. It isn't necessary to have the YouTube app: URLs can be shared from the browser. . -<<<<<<< HEAD -#Probably will only work for www.youtube.com, not for m.youtube.com -#i.e the desktop site only (or the non-free app). There is a -#link to the desktop site on the bottom of m.youtube.com. -======= ->>>>>>> b52e3cd1904b762f13ba1e1f3b7d9c959dcfc5dd Repo Type:git Repo:https://github.com/dentex/ytdownloader.git @@ -29,11 +23,6 @@ rm=dentex.youtube.downloader_v1.3.apk Auto Update Mode:None #Not in Market Update Check Mode:RepoManifest -<<<<<<< HEAD -Current Version:1.3.1 -Current Version Code:31 -======= Current Version:1.3 Current Version Code:30 ->>>>>>> b52e3cd1904b762f13ba1e1f3b7d9c959dcfc5dd