arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 03:08:14 +00:00
Code Issues Releases Wiki Activity

Keep the version.py untouched when merging

Browse Source
This commit is contained in:
Julien Duponchelle 2016-05-11 10:06:21 +02:00
parent f414ce459a
commit a1bf9cdfd3
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
gns3server/version.py merge=ours