acidburnmonkey
3 lines
77 B
Plaintext
3 lines
77 B
Plaintext
# Never merge settings.py - always use branch version
|
|
settings.py merge=ours
|
# Never merge settings.py - always use branch version
|
|
settings.py merge=ours
|