Up resources.
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 2
− 2
@@ -146,7 +146,7 @@ variables:
@@ -175,7 +175,7 @@ variables: