Files
gallery3/.gitattributes
Bharat Mediratta 6849581448 Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
2011-01-16 17:01:03 -08:00

3 lines
36 B
Plaintext

BUILD_NUMBER merge=merge-keep-ours