fix version conflict part 2

RonnyDo · Apr 27, 2018 · 24f9e21 · 24f9e21
1 parent 20d20b7
commit 24f9e21
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/data/com.github.ronnydo.colorpicker.appdata.xml b/data/com.github.ronnydo.colorpicker.appdata.xml
@@ -22,7 +22,23 @@
  <category>Development</category>
  </categories>
  <releases>
- <release version="1.0.3" date="2018-04-27" urgency="medium">
+ <release version="1.0.5" date="2018-04-27" urgency="medium">
+  <description>
+ <ul>
+ <li>Implement 'close with right-mouse-button' feature (issue #27)</li>
+ <li>Update icon</li>
+ <li>Add French, Spanish and Catalan translation</li>
+ </ul>
+ </description>
+ </release>
+ <release version="1.0.4" date="2018-04-27" urgency="medium">
+  <description>
+ <ul>
+ <li>fix version conflict</li>
+ </ul>
+ </description>
+ </release>
+ <release version="1.0.3" date="2018-04-26" urgency="medium">
   <description>
  <ul>
  <li>Implement 'close with right-mouse-button' feature (issue #27)</li>

diff --git a/debian/changelog b/debian/changelog
@@ -1,11 +1,25 @@
-com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=low
+com.github.ronnydo.colorpicker (1.0.5) xenial; urgency=medium
 
  * Implement 'close with right-mouse-button' feature (issue #27)
  * Update icon
  * Add French, Spanish and Catalan translation
 
+ -- Ronny Dobra <ronnydobra at arcor dot de> Thu, 27 Apr 2017 18:31:00 +0100
+
+com.github.ronnydo.colorpicker (1.0.4) xenial; urgency=medium
+
+ * fix version conflicts
+
  -- Ronny Dobra <ronnydobra at arcor dot de> Thu, 27 Apr 2017 13:31:00 +0100
 
+com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=medium
+
+ * Implement 'close with right-mouse-button' feature (issue #27)
+ * Update icon
+ * Add French, Spanish and Catalan translation
+
+ -- Ronny Dobra <ronnydobra at arcor dot de> Thu, 26 Apr 2017 13:31:00 +0100
+
 com.github.ronnydo.colorpicker (1.0.2) xenial; urgency=medium
 
  * Implement "Don't add the same color to color history twice" (issue #24)