From 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 7 Dec 2008 19:44:30 -0700 Subject: Fixed a few files that apparently weren't updated. Signed-off-by: Ira Rice --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index afcca24b..ac227410 100755 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,5 @@ AC_PREREQ(2.59) -<<<<<<< HEAD:configure.ac AC_INIT([Aethyra], [SVN-0.0.27], [irarice@gmail.com], [aethyra]) -======= -AC_INIT([The Mana World], [0.0.26], [elvenprogrammer@gmail.com], [tmw]) ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:configure.ac AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS -- cgit v1.2.3-60-g2f50