3 lines
60 B
Plaintext
3 lines
60 B
Plaintext
*.po merge=ours
|
|
.gitignore merge=ours
|
|
.gitmodules merge=ours |
*.po merge=ours
|
|
.gitignore merge=ours
|
|
.gitmodules merge=ours |