Skip to content

Commit

Permalink
Fixed conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesper Lindstroem Nielsen authored and Jesper Lindstroem Nielsen committed Jul 23, 2011
1 parent f068f77 commit 1160a32
Showing 1 changed file with 20 additions and 41 deletions.
61 changes: 20 additions & 41 deletions tests/visual/effects/effects.all.html
View file
Expand Up @@ -3,53 +3,32 @@
<head>
<meta charset="utf-8">
<title>jQuery UI Effects Test Suite</title>
<<<<<<< HEAD
<link rel="stylesheet" href="effects.all.css" type="text/css" />
<script type="text/javascript" src="../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.fade.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.split.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.build.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.pinwheel.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.blockfade.js"></script>
<script type="text/javascript" src="../../ui/jquery.effects.shear.js"></script>
<script type="text/javascript" src="../../../jquery-1.5.1.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.blind.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.bounce.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.clip.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.drop.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.explode.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.fade.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.fold.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.highlight.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.pulsate.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.scale.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.shake.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.slide.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.transfer.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.split.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.build.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.pinwheel.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.blockfade.js"></script>
<script type="text/javascript" src="../../../ui/jquery.effects.shear.js"></script>
<script type="text/javascript" src="effects.all.js"></script>
=======
<link rel="stylesheet" href="effects.all.css" type="text/css">
<script src="../../../jquery-1.5.1.js"></script>
<script src="../../../ui/jquery.effects.core.js"></script>
<script src="../../../ui/jquery.effects.blind.js"></script>
<script src="../../../ui/jquery.effects.bounce.js"></script>
<script src="../../../ui/jquery.effects.clip.js"></script>
<script src="../../../ui/jquery.effects.drop.js"></script>
<script src="../../../ui/jquery.effects.explode.js"></script>
<script src="../../../ui/jquery.effects.fade.js"></script>
<script src="../../../ui/jquery.effects.fold.js"></script>
<script src="../../../ui/jquery.effects.highlight.js"></script>
<script src="../../../ui/jquery.effects.pulsate.js"></script>
<script src="../../../ui/jquery.effects.scale.js"></script>
<script src="../../../ui/jquery.effects.shake.js"></script>
<script src="../../../ui/jquery.effects.slide.js"></script>
<script src="../../../ui/jquery.effects.transfer.js"></script>
<script src="effects.all.js"></script>
>>>>>>> 51ee3be39829e339c8e4bccb532347944e600ca5
</head>
<body>

<ul class="effects">

<li>
<div class="effect" id="blindUp">
<p>Blind up</p>
Expand Down

0 comments on commit 1160a32

Please sign in to comment.