Skip to content

Commit 353f43a

Browse files
committed
docs: fix merge conflicts
1 parent 67c1306 commit 353f43a

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

jsdoc/doc/animate.js.html

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,7 @@ <h1 class="page-title">Source: animate.js</h1>
6464
overflowHidden: true,
6565
stopPropagation: true,
6666
preventDefault: true,
67-
<<<<<<< HEAD
68-
<<<<<<< HEAD
6967
on: 'click',
70-
=======
71-
>>>>>>> 85a2707 (docs: update documentation)
72-
=======
73-
on: 'click',
74-
>>>>>>> c168c0e (docs: update documentation)
7568
}),
7669
};
7770

@@ -708,25 +701,9 @@ <h3>Modules</h3>
708701
2022 20:22:20 GMT-0300 (Horário Padrão de Brasília)
709702
</footer>
710703

711-
<<<<<<< HEAD
712704
<script>
713705
prettyPrint();
714706
</script>
715707
<script src="scripts/linenumber.js"></script>
716708
</body>
717-
=======
718-
<nav>
719-
<h2><a href="index.html">JS-CSS Animations</a></h2><h3>Modules</h3><ul><li><a href="module-animate.html">animate</a></li><li><a href="module-globals.html">globals</a></li><li><a href="module-js-css-animations.html">js-css-animations</a></li><li><a href="module-measurements.html">measurements</a></li><li><a href="module-resize-parent.html">resize-parent</a></li><li><a href="module-transitions.html">transitions</a></li></ul>
720-
</nav>
721-
722-
<br class="clear">
723-
724-
<footer>
725-
Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 4.0.0</a> on Wed Nov 23 2022 20:32:22 GMT-0300 (Horário Padrão de Brasília)
726-
</footer>
727-
728-
<script> prettyPrint(); </script>
729-
<script src="scripts/linenumber.js"> </script>
730-
</body>
731-
>>>>>>> c168c0e (docs: update documentation)
732709
</html>

0 commit comments

Comments
 (0)