- version upped

fstorck · fstorck · commit c3e63449abc3 · 2018-05-03T15:24:58.000+02:00
diff --git a/plugin.info.txt b/plugin.info.txt
@@ -1,11 +1,7 @@
 base   imgpaste
 author Andreas Gohr
 email  dokuwiki@cosmocode.de
-<<<<<<< HEAD
-date   2016-09-20
-=======
-date   2017-09-24
->>>>>>> 02d362229275b1bdd8bf705f313142c5ebef8a51
+date   2018-05-03
 name   imgpaste plugin
-desc   Add images via cut'n'paste in Chrome 
+desc   Add images via cut'n'paste in Chrome
 url    http://www.dokuwiki.org/plugin:imgpaste
