Skip to content
This repository was archived by the owner on Sep 22, 2024. It is now read-only.

Commit c48faa2

Browse files
201flaviosilva201flaviosilva
committed
fix merge
1 parent e91c8d2 commit c48faa2

File tree

1 file changed

+0
-13
lines changed
  • chp01_vectors/NOC_1_02_bouncingball_vectors

1 file changed

+0
-13
lines changed

‎chp01_vectors/NOC_1_02_bouncingball_vectors/index.html

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,13 @@
22
<html>
33

44
<head>
5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/p5.js"></script>
8-
<script language="javascript" type="text/javascript" src="sketch.js"></script>
9-
=======
105
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
116
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
12-
=======
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
14-
>>>>>>> master
157
<meta charset="utf-8" />
16-
>>>>>>> master
178
</head>
189

1910
<body>
2011
<script src="sketch.js"></script>
2112
</body>
22-
<<<<<<< HEAD
23-
</html>
24-
=======
2513

2614
</html>
27-
>>>>>>> master

0 commit comments

Comments
 (0)