From 99dedd3827a15461d62f081856c83441ba54cbfb Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Tue, 1 Mar 2016 21:00:38 +0100 Subject: [PATCH] Rebuild for Jessie --- debian/changelog | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d3f434..c0a805b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,10 @@ -<<<<<<< HEAD -moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high -======= -moonlight-embedded (2.1.4-1wheezy1) RELEASED; urgency=high +moonlight-embedded (2.1.4-1jessie1) RELEASED; urgency=high * Update to version 2.1.4 -- Iwan Timmer Tue, 1 Mar 2016 20:23:54 +0200 -moonlight-embedded (2.1.3-1wheezy1) RELEASED; urgency=high ->>>>>>> raspbian/wheezy +moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high * Update to version 2.1.3