diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 9122eeb1..fdf9d072 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -BUILD_NUMBER merge=merge-keep-ours +.build_number merge=merge-keep-ours |