animate-css
diff --git a/‎animate.css‎
Lines changed: 2 additions & 4 deletions b/‎animate.css‎
Lines changed: 2 additions & 4 deletions
@@ -529,11 +529,9 @@ Copyright (c) 2015 Daniel Eden
     -webkit-transform: none;
             transform: none
   }
-<<<<<<< HEAD
+
   22.2% {
-=======
-  30% {
->>>>>>> redid jello.css
+
     -webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
             transform: skewX(-12.5deg) skewY(-12.5deg)
   }
Original file line number	Diff line number	Diff line change
`@@ -529,11 +529,9 @@ Copyright (c) 2015 Daniel Eden`
`529`	`529`	`-webkit-transform: none;`
`530`	`530`	`transform: none`
`531`	`531`	`}`
`532`		`-<<<<<<< HEAD`
	`532`	`+`
`533`	`533`	`22.2% {`
`534`		`-=======`
`535`		`- 30% {`
`536`		`->>>>>>> redid jello.css`
	`534`	`+`
`537`	`535`	`-webkit-transform: skewX(-12.5deg) skewY(-12.5deg);`
`538`	`536`	`transform: skewX(-12.5deg) skewY(-12.5deg)`
`539`	`537`	`}`