redid jello.css

procodeing · procodeing · commit 730766406174 · 2015-05-12T01:30:12.000Z
diff --git a/animate.css b/animate.css
@@ -489,6 +489,7 @@ Copyright (c) 2015 Daniel Eden
     -webkit-transform: none;
             transform: none
   }
+
   22.2% {
     -webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
             transform: skewX(-12.5deg) skewY(-12.5deg)
@@ -528,7 +529,11 @@ 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)
   }
@@ -562,6 +567,8 @@ Copyright (c) 2015 Daniel Eden
   }
 }
 
+
+
 .jello{
     -webkit-animation-name:jello;
             animation-name:jello;

Original file line number	Diff line number	Diff line change
`@@ -489,6 +489,7 @@ Copyright (c) 2015 Daniel Eden`
`489`	`489`	`-webkit-transform: none;`
`490`	`490`	`transform: none`
`491`	`491`	`}`
	`492`	`+`
`492`	`493`	`22.2% {`
`493`	`494`	`-webkit-transform: skewX(-12.5deg) skewY(-12.5deg);`
`494`	`495`	`transform: skewX(-12.5deg) skewY(-12.5deg)`
`@@ -528,7 +529,11 @@ Copyright (c) 2015 Daniel Eden`
`528`	`529`	`-webkit-transform: none;`
`529`	`530`	`transform: none`
`530`	`531`	`}`
	`532`	`+<<<<<<< HEAD`
`531`	`533`	`22.2% {`
	`534`	`+=======`
	`535`	`+ 30% {`
	`536`	`+>>>>>>> redid jello.css`
`532`	`537`	`-webkit-transform: skewX(-12.5deg) skewY(-12.5deg);`
`533`	`538`	`transform: skewX(-12.5deg) skewY(-12.5deg)`
`534`	`539`	`}`
`@@ -562,6 +567,8 @@ Copyright (c) 2015 Daniel Eden`
`562`	`567`	`}`
`563`	`568`	`}`
`564`	`569`
	`570`	`+`
	`571`	`+`
`565`	`572`	`.jello{`
`566`	`573`	`-webkit-animation-name:jello;`
`567`	`574`	`animation-name:jello;`