diff options
-rw-r--r-- | configure.ac | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8ddbf84..49e6289 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,4 @@ -<<<<<<< HEAD -AC_INIT([sugar-base],[0.87.2],[],[sugar-base]) -======= AC_INIT([sugar-base],[0.92.0],[],[sugar-base]) ->>>>>>> eb7ada51259747e39c064abb1eae9be7c01e71d3 AC_PREREQ([2.59]) |