Skip to content
Snippets Groups Projects
Forked from atlas / athena
130839 commits behind the upstream repository.
Attila Krasznahorkay's avatar
Attila Krasznahorkay authored
Conflicts:
	Projects/AthSimulation/externals.txt
	Projects/Athena/externals.txt

Resolved two minor conflicts in Athena/externals.txt and AthSimulation/externals.txt.
At the same time updated the externals.txt files a bit to try to prevent similar
conflicts to appear in the future. (By moving the "changable" lines in the files
a bit further apart.)


Former-commit-id: a9017398
a7158d1d
History
Name Last commit Last update
..
AnalysisBase
AthSimulation
Athena
WorkDir