search

padsley / k600analyser

Code for the K600 analyser including plugin codes for silicon, clover and HAGAR data
1 stars 4 forks source link

PR238_2016 into PR264 for the porpoises of using the scintillators #133

Closed padsley closed 8 years ago

padsley commented 8 years ago

Just for my reference:

Auto-merging main.c CONFLICT (content): Merge conflict in main.c Auto-merging basic.odb CONFLICT (content): Merge conflict in basic.odb Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile Automatic merge failed; fix conflicts and then commit the result.

padsley commented 8 years ago

Done. Can someone test this?

padsley commented 8 years ago

Wait. There's an error. Looking into it.

pellegri commented 8 years ago

Error???

On 27 Jul 2016, at 12:10, Philip Adsley notifications@github.com wrote:

Wait. There's an error. Looking into it.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/padsley/k600analyser/pull/133#issuecomment-235544125, or mute the thread https://github.com/notifications/unsubscribe-auth/AKA6lfmXoK5n4jQ4FsnNd1Lhbm3lM5qEks5qZy6FgaJpZM4JWB65.

padsley commented 8 years ago

For reference: the problem was that beamline.o was not included in the Makefile because I'm a numpty who can't read. Now fixed.