MC-4117: Update banner to use new background images logic

anthoula · anthoula · commit 27deceaf76ca · 2018-10-09T08:48:19.000-05:00
- remove merge conflict artifact
diff --git a/docs/master-format.md b/docs/master-format.md
@@ -850,7 +850,6 @@ Attributes
 5. data-target
 6. data-link-type
 
-<<<<<<< HEAD
 ### wrapper element
 
 Attributes
