Commits · master · Marcin Wolter / athena

Jul 29, 2022
- SweepRule: remove trigger references from ignore list · 23c4a5d1
  Frank Winklmeier authored 2 years ago
  
  For the moment we still keep the trigger references in sync between 22.0 and master.
  23c4a5d1
- SweepRule: add git attributes file · 40976ac4
  Frank Winklmeier authored 2 years ago
  
  Add git `attributes` file for manual merges of 22.0 into master.
  40976ac4
May 26, 2022
- Revert "22.0 -> master sweeping rule" · 2c2bdc3d
  Adam Edward Barton authored 2 years ago
  
  This reverts commit a438e8ab.
  2c2bdc3d
May 23, 2022
- 22.0 -> master sweeping rule · a438e8ab
  Atlas-Software Librarian authored 2 years ago and Johannes Elmsheuser committed 2 years ago
  
  a438e8ab
May 17, 2022
- 22.0 -> master sweeping rule · aa437f5f
  Atlas-Software Librarian authored 2 years ago
  
  aa437f5f
Dec 11, 2017
- Revert "Revert "fix conflicts of KinkTrkSingleJetMetFilterTool"" · ae064298
  Toshiaki Kaji authored 7 years ago
  
  This reverts commit cdf718bf [formerly 9d67f5b8]. Former-commit-id: 008b62d0
  ae064298
Dec 08, 2017

Toshiaki Kaji authored 7 years ago

This reverts commit 9156e32a [formerly f73d17d3], reversing
changes made to 27d106d1 [formerly 8f2f5188].


Former-commit-id: 9d67f5b8

cdf718bf

Nov 17, 2017
- CI/config.yaml -> SweepRule/config.yaml · 67b8190e
  Atlas-Software Librarian authored 7 years ago
  
  Former-commit-id: 2131f448fd2ec8a0a5180450c75b80a0214aec12
  67b8190e