| commit | 5eb828c2a6106db414ef17a9ffc96e016dae6184 | [log] [tgz] |
|---|---|---|
| author | Uwe Schindler <uschindler@apache.org> | Fri Jun 18 01:03:26 2021 +0200 |
| committer | Uwe Schindler <uschindler@apache.org> | Fri Jun 18 01:03:26 2021 +0200 |
| tree | d099ed674b2ab805e49d4127ff9eabe16fc9f195 | |
| parent | 4b99944d2a1a9ccc37a98e860a0d487ff0e826a6 [diff] |
Prevent merge of .asf.yaml control file
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6f456b8 --- /dev/null +++ b/.gitattributes
@@ -0,0 +1,2 @@ +# Don't merge the ASF config file, which has details about THIS branch: +.asf.yaml merge=ours