Resolve #3420042 "Bring external template"
4 unresolved threads
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 28
− 16
@@ -12,23 +12,35 @@
@@ -12,23 +12,35 @@
@@ -42,7 +54,7 @@ include:
@@ -42,7 +54,7 @@ include: