Closed Marukyu closed 8 years ago
If anyone gets merge conflicts, simply run the formatter and replace each affected file's content with your local version.
If anyone gets merge conflicts, simply run the formatter and replace each affected file's content with your local version.