Fork me on GitHub

Changeset 6ba7847 in git


Ignore:
Timestamp:
Apr 11, 2018, 4:21:10 PM (7 years ago)
Author:
Ulrike Schnoor <ulrike.schnoor@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
b1d948c
Parents:
9666d3b
Message:

fixed conflict in Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r9666d3b r6ba7847  
    19031903        @touch $@
    19041904
    1905 <<<<<<< HEAD
    1906 
    19071905external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
    19081906        external/fastjet/ClusterSequence.hh \
    … …  
    19101908        @touch $@
    19111909
    1912 =======
    1913 >>>>>>> upstream/master
    19141910external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
    19151911        external/fastjet/ClusterSequence.hh \
Note: See TracChangeset for help on using the changeset viewer.