From: RafiBomb <rafi@zurb.com>
Date: Wed, 19 Apr 2017 22:07:26 +0000 (-0700)
Subject: fixes merge conflict
X-Git-Tag: v2.3.0~7^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b4690cc9a9de37950722868de10968ee59efd1;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fixes merge conflict
---

d9b4690cc9a9de37950722868de10968ee59efd1
diff --cc test/visual/pages/inliner-bugs.html
index bdf0fb55,207ee5e8..0a113ce0
--- a/test/visual/pages/inliner-bugs.html
+++ b/test/visual/pages/inliner-bugs.html
@@@ -4,8 -4,8 +4,9 @@@
  
        #417 - 2 sets of angle backets: outer set should not get converted to charachter codes. you should not see 2 angle brackets here:
        <br>
-       <raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>
-       confirmed on inliner (both) need to
++
+       <!-- <raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>
 -      confirmed on inliner (both) need to  -->
++      confirmed on inliner (both) need to -->
  
        <hr>
  
@@@ -97,4 -97,3 +98,4 @@@
      </columns>
    </row>
  </container>
-  -->
++