summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2017-07-02 11:08:52 +0200
committerraveit65 <[email protected]>2017-07-02 11:08:52 +0200
commit8caba2119a68da7698072e6b6edece7828ce2b2a (patch)
treeebe81ff0e57696145f2686490026477d98fd0d6a
parent9907e2a5c09838d1e7f1835e7cc47e456cf63266 (diff)
downloadmate-themes-8caba2119a68da7698072e6b6edece7828ce2b2a.tar.bz2
mate-themes-8caba2119a68da7698072e6b6edece7828ce2b2a.tar.xz
drop garbage from configure.ac
-rw-r--r--configure.ac4
1 files changed, 0 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index eff1d60e..6b187f68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,6 @@
AC_PREREQ(2.53)
-<<<<<<< HEAD
-AC_INIT([mate-themes], [3.22.9], [http://www.mate-desktop.org])
-=======
AC_INIT([mate-themes], [3.22.11], [http://www.mate-desktop.org])
->>>>>>> b8765a9a... release 3.22.11
AC_CONFIG_SRCDIR([icon-themes])
AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])