diff options
Diffstat (limited to 'doc/university/training/topics/merge_conflicts.md')
| -rw-r--r--[-rwxr-xr-x] | doc/university/training/topics/merge_conflicts.md | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index 77807b3e7ef..77807b3e7ef 100755..100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md |