summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2012-04-23 21:46:01 +0200
committerPatrick Simianer <p@simianer.de>2012-04-23 21:46:01 +0200
commit48bfd6dd2319c5b21fdbc963ee5be4eb048a0b13 (patch)
treec57236355cbb682da47050c60af3ef1d0efb7b97 /configure.ac
parent2f427278616cbe3fa6f56d6b97c40b3894dbd950 (diff)
fix
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index c0e7388d..47da5bb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,8 +130,4 @@ then
AM_CONDITIONAL([GLC], true)
fi
-<<<<<<< HEAD
-AC_OUTPUT(Makefile utils/Makefile mteval/Makefile extools/Makefile decoder/Makefile phrasinator/Makefile training/Makefile dpmert/Makefile pro-train/Makefile klm/util/Makefile klm/lm/Makefile mira/Makefile dtrain/Makefile gi/pyp-topics/src/Makefile gi/clda/src/Makefile gi/pf/Makefile gi/markov_al/Makefile)
-=======
-AC_OUTPUT(Makefile rst_parser/Makefile utils/Makefile mteval/Makefile extools/Makefile decoder/Makefile phrasinator/Makefile training/Makefile dpmert/Makefile pro-train/Makefile klm/util/Makefile klm/lm/Makefile mira/Makefile gi/pyp-topics/src/Makefile gi/clda/src/Makefile gi/pf/Makefile gi/markov_al/Makefile)
->>>>>>> upstream/master
+AC_OUTPUT(Makefile rst_parser/Makefile utils/Makefile mteval/Makefile extools/Makefile decoder/Makefile phrasinator/Makefile training/Makefile dpmert/Makefile pro-train/Makefile klm/util/Makefile klm/lm/Makefile mira/Makefile dtrain/Makefile gi/pyp-topics/src/Makefile gi/clda/src/Makefile gi/pf/Makefile gi/markov_al/Makefile)