diff --git a/SweepRule/attributes b/SweepRule/attributes deleted file mode 100644 index 70ab276862869317a69d8be78f943526ead54adb..0000000000000000000000000000000000000000 --- a/SweepRule/attributes +++ /dev/null @@ -1,11 +0,0 @@ -# git attributes for manual merges of production branches into master -# -# Requires the following merge driver to be defined: -# git config --global merge.ours.driver true -# -# See https://atlassoftwaredocs.web.cern.ch/guides/release_coordinators -# - -# Ignore changes to Projects and build scripts: -Projects/** merge=ours -Build/** merge=ours