diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-05-28 14:57:12 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-05-28 14:57:12 (GMT) |
| commit | 7ed3d267e43283274fc3e3a5c5338b4904f57a54 (patch) | |
| tree | c41696e610e903c3801dfba4a01b98ed94956dfc | |
| parent | 63e8dcfeef3147524508c92d3868d90b05c5f9e3 (diff) | |
fix configure.ac breakage caused by Pootle
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
| -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]) |