Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
Co-Authored-By: gianjohansen <gian.johansen@gmail.com>
  • Loading branch information
daneden and gianjohansen committed Jul 21, 2018
1 parent 611b8cc commit de6b531
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions animate.css
Original file line number Diff line number Diff line change
Expand Up @@ -2226,13 +2226,11 @@
80% {
-webkit-transform: skewX(-5deg);
transform: skewX(-5deg);
opacity: 1;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
opacity: 1;
}
}

Expand All @@ -2252,13 +2250,11 @@
80% {
-webkit-transform: skewX(-5deg);
transform: skewX(-5deg);
opacity: 1;
}

to {
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
opacity: 1;
}
}

Expand Down
Loading

0 comments on commit de6b531

Please sign in to comment.