From 730766406174d63555591e6f30393b5c22419ad5 Mon Sep 17 00:00:00 2001
From: Indy Prieto <proforced@gmail.com>
Date: Sat, 9 May 2015 18:43:20 -0500
Subject: [PATCH] redid jello.css

---
 animate.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/animate.css b/animate.css
index 9304cfb..cbbf124 100755
--- 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;