resolve build conflicts

RonnyDo · RonnyDo · commit a5b3e9bf4ff0 · 2019-01-02T21:33:18.000+01:00
diff --git a/data/com.github.ronnydo.colorpicker.appdata.xml b/data/com.github.ronnydo.colorpicker.appdata.xml
@@ -22,7 +22,7 @@
 	<category>Development</category>
   </categories>
   <releases>
-  	​<release version="1.1.1" date="2019-01-02" urgency="medium">
+  	​<release version="1.1.2" date="2019-01-02" urgency="medium">
   	​  <description>
   	    <ul>
   		  <li>Juno Release!!1! (finally)</li>
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-com.github.ronnydo.colorpicker (1.1.1) bionic; urgency=medium
+com.github.ronnydo.colorpicker (1.1.2) bionic; urgency=medium
 
   * Juno Release!!1! (finally)
   * "Olá em português" (Translation by @drom98)
diff --git a/debian/control b/debian/control
@@ -1,7 +1,7 @@
 Source: com.github.ronnydo.colorpicker
 Section: x11
 Priority: extra
-Maintainer: Ronny Dobra <ronnydobra at arcor dot de>
+Maintainer: Ronny Dobra <ronnydobra@arcor.de>
 Build-Depends: debhelper (>= 9),
                libgranite-dev,
                libgtk-3-dev,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-com.github.ronnydo.colorpicker (1.1.1) bionic; urgency=medium`
	`1`	`+com.github.ronnydo.colorpicker (1.1.2) bionic; urgency=medium`
`2`	`2`
`3`	`3`	`* Juno Release!!1! (finally)`
`4`	`4`	`* "Olá em português" (Translation by @drom98)`