reverting conflict created by Arturs commit
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Dec 2007 20:52:20 +0000 (20:52 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 13 Dec 2007 20:52:20 +0000 (20:52 +0000)
HLT/configure.ac

index 505bf03..8a1786f 100644 (file)
@@ -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])