From: SoonKyu Park <sk7.park@samsung.com>
Date: Tue, 4 Apr 2017 09:56:54 +0000 (+0900)
Subject: Handle conflicts merging from master branch
X-Git-Tag: submit/devel/20190730.074511~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e36614e4c59bd7f51ab7ce603b8a06f90d410b39;p=tools%2Fdepanneur.git

Handle conflicts merging from master branch

Change-Id: I7716a4373225efed72f0d13037c512da3cd05d28
---

e36614e4c59bd7f51ab7ce603b8a06f90d410b39
diff --cc debian/changelog
index 56b8826,b0be6ac..6408aea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ depanneur (0.15.4) unstable; urgency=high
+ 
+   * Support 'Recommands:' inside spec file
+ 
 - -- SoonKyu Park <sk7.park@samsung.com> Sat, 14 Jan 2017 19:30:00 +0800
++ -- SoonKyu Park <sk7.park@samsung.com>  Sat, 14 Jan 2017 19:30:00 +0800
+ 
  depanneur (0.15.3) unstable; urgency=high
  
    * Enable kvm build function.