Keep the version.py untouched when merging

pull/565/head
Julien Duponchelle 8 years ago
parent f414ce459a
commit a1bf9cdfd3
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8

2
.gitattributes vendored

@ -0,0 +1,2 @@
gns3server/version.py merge=ours
Loading…
Cancel
Save