mollyim/mollyim-insider-android
1
0
Fork 0
mirror of https://github.com/mollyim/mollyim-insider-android.git synced 2025-05-12 21:30:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update .gitattributes for merge conflict resolution

Browse source
This commit is contained in:
Oscar Mira 2024-04-23 10:32:43 +02:00
parent 9117a15736
commit 9cc1d39235
No known key found for this signature in database
GPG key ID: B371B98C5DC32237
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitattributes vendored
View file

@ -1 +1,8 @@
*.ai binary
# MOLLY: Reduce the number of merge conflicts.
#
# Note: also need:
# git config merge.ours.driver true
# git config merge.theirs.driver 'cp -- %B %A'
/app/src/main/res/values-*/strings.xml merge=theirs
/gradle/verification-metadata.xml merge=union