From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 13 Dec 2007 20:52:20 +0000 (+0000)
Subject: reverting conflict created by Arturs commit
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=835a84c7a5abf63a783b197ddda19914bacedc01

reverting conflict created by Arturs commit
---

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 505bf03f45e..8a1786f5a2e 100644
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -630,13 +630,8 @@ AH_TEMPLATE([HLT_MUON],[hlt dimuon library])
 
 ALIMUON_LIBS=
 CHECK_HLTMODULE([dimuon],
-<<<<<<< configure.ac
-		[AliMUONTriggerIO.h AliMUONVCluster.h], 
-		[$ALIROOT_CPPFLAGS -I$ALICE_ROOT/MUON],
-=======
 		[AliMpExMap.h AliMUONTriggerIO.h], 
 		[$ALIROOT_CPPFLAGS -I$ALICE_ROOT/MUON -I$ALICE_ROOT/MUON/mapping],
->>>>>>> 1.54
 		[], [-L$ROOTLIBDIR], [$ROOTLIBS $ADD_ROOTLIBS],
 		[], [-L$ROOTLIBDIR $ALIROOT_LDFLAGS], 
 		[$ROOTLIBS $ADD_ROOTLIBS $ALIROOT_LIBS])