Radiate information about anything that can cause confusion.
Compare changes
Conflict: This file was modified in the source branch, but removed in the target branch.
Ask someone with write access to resolve it.
+ 2
− 2
@@ -79,6 +79,7 @@ extra_css:
@@ -204,4 +205,4 @@ extra_css:
\ No newline at end of file