Jeu d'icônes en conflit de merge

core/vendor/zwiico/css/zwiico-codes.css

@@ -55,14 +55,8 @@
 .zwiico-calendar-empty:before { content: '\f133'; } /* '' */
 .zwiico-youtube:before { content: '\f167'; } /* '' */
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zwiico-box:before { content: '\f187'; } /* '' */
 .zwiico-file-archive:before { content: '\f1c6'; } /* '' */
-=======
->>>>>>> Nouveau jeu d'icônes
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 .zwiico-sliders:before { content: '\f1de'; } /* '' */
 .zwiico-brush:before { content: '\f1fc'; } /* '' */
 .zwiico-pinterest:before { content: '\f231'; } /* '' */

core/vendor/zwiico/css/zwiico-ie7-codes.css

@@ -55,14 +55,8 @@
 .zwiico-calendar-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-youtube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zwiico-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf187;&nbsp;'); }
 .zwiico-file-archive { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1c6;&nbsp;'); }
-=======
->>>>>>> Nouveau jeu d'icônes
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 .zwiico-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1de;&nbsp;'); }
 .zwiico-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1fc;&nbsp;'); }
 .zwiico-pinterest { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf231;&nbsp;'); }

core/vendor/zwiico/css/zwiico-ie7.css

@@ -66,14 +66,8 @@
 .zwiico-calendar-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-youtube { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .zwiico-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zwiico-box { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf187;&nbsp;'); }
 .zwiico-file-archive { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1c6;&nbsp;'); }
-=======
->>>>>>> Nouveau jeu d'icônes
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 .zwiico-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1de;&nbsp;'); }
 .zwiico-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf1fc;&nbsp;'); }
 .zwiico-pinterest { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf231;&nbsp;'); }

core/vendor/zwiico/css/zwiico.css

@@ -1,26 +1,11 @@
 @font-face {
   font-family: 'zwiico';
-<<<<<<< HEAD
-<<<<<<< HEAD
   src: url('../font/zwiico.eot?39677933');
   src: url('../font/zwiico.eot?39677933#iefix') format('embedded-opentype'),
        url('../font/zwiico.woff2?39677933') format('woff2'),
        url('../font/zwiico.woff?39677933') format('woff'),
        url('../font/zwiico.ttf?39677933') format('truetype'),
        url('../font/zwiico.svg?39677933#zwiico') format('svg');
-=======
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
-  src: url('../font/zwiico.eot?37992248');
-  src: url('../font/zwiico.eot?37992248#iefix') format('embedded-opentype'),
-       url('../font/zwiico.woff2?37992248') format('woff2'),
-       url('../font/zwiico.woff?37992248') format('woff'),
-       url('../font/zwiico.ttf?37992248') format('truetype'),
-       url('../font/zwiico.svg?37992248#zwiico') format('svg');
-<<<<<<< HEAD
->>>>>>> Nouveau jeu d'icônes
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
   font-weight: normal;
   font-style: normal;
 }
@@ -30,15 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'zwiico';
-<<<<<<< HEAD
-<<<<<<< HEAD
     src: url('../font/zwiico.svg?39677933#zwiico') format('svg');
-=======
-    src: url('../font/zwiico.svg?37992248#zwiico') format('svg');
->>>>>>> Nouveau jeu d'icônes
-=======
-    src: url('../font/zwiico.svg?37992248#zwiico') format('svg');
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
   }
 }
 */
@@ -133,14 +110,8 @@
 .zwiico-calendar-empty:before { content: '\f133'; } /* '' */
 .zwiico-youtube:before { content: '\f167'; } /* '' */
 .zwiico-instagram:before { content: '\f16d'; } /* '' */
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zwiico-box:before { content: '\f187'; } /* '' */
 .zwiico-file-archive:before { content: '\f1c6'; } /* '' */
-=======
->>>>>>> Nouveau jeu d'icônes
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 .zwiico-sliders:before { content: '\f1de'; } /* '' */
 .zwiico-brush:before { content: '\f1fc'; } /* '' */
 .zwiico-pinterest:before { content: '\f231'; } /* '' */

core/vendor/zwiico/font/zwiico.svg

@@ -118,13 +118,10 @@
 
 <glyph glyph-name="instagram" unicode="&#xf16d;" d="M571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m77 0q0-91-64-156t-155-64-156 64-64 156 64 156 156 64 155-64 64-156z m61 229q0-21-15-36t-37-15-36 15-15 36 15 36 36 15 37-15 15-36z m-280 123q-4 0-43 0t-59 0-54-2-57-5-40-11q-28-11-49-32t-33-49q-6-16-10-40t-6-58-1-53 0-59 0-43 0-43 0-59 1-53 6-58 10-40q12-28 33-49t49-32q16-6 40-11t57-5 54-2 59 0 43 0 42 0 59 0 54 2 58 5 39 11q28 11 50 32t32 49q6 16 10 40t6 58 1 53 0 59 0 43 0 43 0 59-1 53-6 58-10 40q-11 28-32 49t-50 32q-16 6-39 11t-58 5-54 2-59 0-42 0z m428-352q0-128-3-177-5-116-69-180t-179-69q-50-3-177-3t-177 3q-116 6-180 69t-69 180q-3 49-3 177t3 177q5 116 69 180t180 69q49 3 177 3t177-3q116-6 179-69t69-180q3-49 3-177z" horiz-adv-x="857.1" />
 
-<<<<<<< HEAD
 <glyph glyph-name="box" unicode="&#xf187;" d="M607 386q0 14-10 25t-26 10h-142q-15 0-25-10t-11-25 11-25 25-11h142q15 0 26 11t10 25z m322 107v-536q0-14-11-25t-25-11h-786q-14 0-25 11t-11 25v536q0 14 11 25t25 11h786q14 0 25-11t11-25z m35 250v-143q0-14-10-25t-25-11h-858q-14 0-25 11t-10 25v143q0 14 10 25t25 11h858q14 0 25-11t10-25z" horiz-adv-x="1000" />
 
 <glyph glyph-name="file-archive" unicode="&#xf1c6;" d="M357 636v71h-71v-71h71z m72-72v72h-72v-72h72z m-72-71v71h-71v-71h71z m72-72v72h-72v-72h72z m390 217q16-16 27-42t11-50v-642q0-23-15-38t-38-16h-750q-23 0-38 16t-16 38v892q0 23 16 38t38 16h500q22 0 49-11t42-27z m-248 136v-210h210q-5 17-12 23l-175 175q-6 7-23 12z m215-853v572h-232q-23 0-38 16t-16 37v233h-71v-72h-72v72h-286v-858h715z m-350 403l60-195q4-15 4-29 0-46-40-77t-103-30-102 30-41 77q0 14 5 29 12 35 67 221v71h71v-71h44q13 0 22-7t13-19z m-79-260q30 0 51 11t21 25-21 25-51 11-50-11-21-25 21-25 50-11z" horiz-adv-x="857.1" />
 
-=======
->>>>>>> 957121d76ec1c3c2f545d39f4228d501487904af
 <glyph glyph-name="sliders" unicode="&#xf1de;" d="M196 64v-71h-196v71h196z m197 72q14 0 25-11t11-25v-143q0-14-11-25t-25-11h-143q-14 0-25 11t-11 25v143q0 15 11 25t25 11h143z m89 214v-71h-482v71h482z m-357 286v-72h-125v72h125z m732-572v-71h-411v71h411z m-536 643q15 0 26-10t10-26v-142q0-15-10-25t-26-11h-142q-15 0-25 11t-11 25v142q0 15 11 26t25 10h142z m358-286q14 0 25-10t10-25v-143q0-15-10-25t-25-11h-143q-15 0-25 11t-11 25v143q0 14 11 25t25 10h143z m178-71v-71h-125v71h125z m0 286v-72h-482v72h482z" horiz-adv-x="857.1" />
 
 <glyph glyph-name="brush" unicode="&#xf1fc;" d="M901 850q39 0 69-26t29-65q0-35-25-84-185-351-260-420-54-51-121-51-71 0-121 52t-51 123q0 71 52 118l356 323q33 30 72 30z m-507-577q22-42 59-73t84-42l1-40q2-118-72-193t-195-75q-68 0-121 26t-85 71-49 102-16 123q4-3 23-17t35-25 32-20 26-9q23 0 31 20 14 37 32 63t39 42 49 27 57 14 70 6z" horiz-adv-x="1000" />