NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 06:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep the version.py untouched when merging

Browse Source
This commit is contained in:
Julien Duponchelle committed 2016-05-11 10:06:21 +02:00
1 parent f414ce459a
commit a1bf9cdfd3
1 file changed
+2
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+2
View File
@@ -0,0 +1,2 @@
gns3server/version.py merge=ours