source: iPeer/.gitattributes

Last change on this file was 2c6ace5, checked in by Compass <pan.luo@…>, 5 years ago

added ours merge strategy to app/config/core.php so that different branch can have different debug settings

  • Property mode set to 100644
File size: 31 bytes
1app/config/core.php merge=ours
Note: See TracBrowser for help on using the repository browser.