1c/1C-Functin-to-yEd
1
0
Fork 0
mirror of https://github.com/SergeFocus/1C-Functin-to-yEd.git synced 2025-03-03 14:32:19 +02:00
Code Issues Releases Activity

добавлены атрибуты для корректного слияния с уже существующими репозиторями

Browse Source 
Signed-off-by: Alexey Lustin <alustin@silverbulleters.org>
This commit is contained in:
Alexey Lustin 2015-09-19 11:24:18 +03:00
parent bed42d9f8e
commit 8559e61aa1
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 @@
README.md merge=ours
.gitmodules merge=ours