* updated to branch_0.12.0 (new trunk)

[modchxj/mod_chxj.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 6aef5c3..3213f8c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,3 @@
-<<<<<<< HEAD:src/Makefile.in
-=======
 # Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
@@ -863,4 +861,3 @@ activate: make_so
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
->>>>>>>   * updated new trunk.:src/Makefile.in