diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
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]) |