Skip to content

Commit 67c1306

Browse files
committed
docs: update documentation
1 parent e84eca0 commit 67c1306

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

jsdoc/doc/animate.js.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ <h1 class="page-title">Source: animate.js</h1>
6464
overflowHidden: true,
6565
stopPropagation: true,
6666
preventDefault: true,
67+
<<<<<<< HEAD
6768
<<<<<<< HEAD
6869
on: 'click',
6970
=======
7071
>>>>>>> 85a2707 (docs: update documentation)
72+
=======
73+
on: 'click',
74+
>>>>>>> c168c0e (docs: update documentation)
7175
}),
7276
};
7377

@@ -704,9 +708,25 @@ <h3>Modules</h3>
704708
2022 20:22:20 GMT-0300 (Horário Padrão de Brasília)
705709
</footer>
706710

711+
<<<<<<< HEAD
707712
<script>
708713
prettyPrint();
709714
</script>
710715
<script src="scripts/linenumber.js"></script>
711716
</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)
712732
</html>

0 commit comments

Comments
 (0)