Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolved merge conflict

  • Loading branch information...
commit 752d80cd97d19efd043379fc4715cca9f339e41b 2 parents 387e31d + 8170cf5
@LeaVerou authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 index.html
View
7 index.html
@@ -38,13 +38,12 @@
#36c;
background-size: 15px 30px" title="Half-Rombes" data-author="Valentin Agachi" data-author-url="http://agachi.name/"></li>
- <li style="background:
-linear-gradient(45deg, #92baac 45px, transparent 45px),
+ <li style="background:
linear-gradient(45deg, #92baac 45px, transparent 45px)64px 64px,
-linear-gradient(225deg, transparent 46px, #e1ebbd 46px, #e1ebbd 91px, transparent 91px),
+linear-gradient(45deg, #92baac 45px, transparent 45px,transparent 91px, #e1ebbd 91px, #e1ebbd 135px, transparent 135px),
linear-gradient(-45deg, #92baac 23px, transparent 23px, transparent 68px,#92baac 68px,#92baac 113px,transparent 113px,transparent 158px,#92baac 158px);
background-color:#e1ebbd;
-background-size: 128px 128px" title="Arrows" data-author="Jeroen Franse" data-author-url="http://twitter.com/jroenf"></li>
+background-size: 128px 128px;" title="Arrows" data-author="Jeroen Franse" data-author-url="http://twitter.com/jroenf"></li>
<li style="background:
linear-gradient(135deg, #ECEDDC 25%, transparent 25%) -50px 0,
Please sign in to comment.
Something went wrong with that request. Please try again.