From 6a853bd1f24f4ca9e2659375d30e8ab28725f026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
Date: Wed, 28 Dec 2016 21:15:10 +0100
Subject: [PATCH] Update to latest upstream release

---
 youtube-dl.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/youtube-dl.spec b/youtube-dl.spec
index c4030bf..1c2af94 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -6,13 +6,8 @@
 %endif
 
 Name:           youtube-dl
-<<<<<<< d570a9603dd215aaa30c31a5dccb35ad277862a5
-Version:        2016.12.09
-Release:        2%{?dist}
-=======
 Version:        2016.12.22
 Release:        1%{?dist}
->>>>>>> Update to latest upstream release
 Summary:        A small command-line program to download online videos
 License:        Unlicense
 URL:            https://yt-dl.org