Merge pull request #118 from 201flaviosilva-labs/master

shiffman · web-flow · commit 55f7606b1223 · 2022-04-19T08:25:18.000-04:00
fix step to walk in NOC_I_05_NoiseWalk and merge conflict
diff --git a/chp00_introduction/NOC_I_05_NoiseWalk/sketch.js b/chp00_introduction/NOC_I_05_NoiseWalk/sketch.js
@@ -11,7 +11,7 @@ function setup() {
 }
 
 function draw() {
-  walker.step();
+  walker.walk();
   walker.display();
 }
 
diff --git a/chp01_vectors/NOC_1_02_bouncingball_vectors/index.html b/chp01_vectors/NOC_1_02_bouncingball_vectors/index.html
@@ -2,26 +2,13 @@
 <html>
 
 <head>
-<<<<<<< HEAD
-<<<<<<< HEAD
-  <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.5.7/p5.js"></script>
-  <script language="javascript" type="text/javascript" src="sketch.js"></script>
-=======
   <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/p5.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.9.0/addons/p5.dom.min.js"></script>
-=======
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.4.1/p5.min.js"></script>
->>>>>>> master
   <meta charset="utf-8" />
->>>>>>> master
 </head>
 
 <body>
   <script src="sketch.js"></script>
 </body>
-<<<<<<< HEAD
-</html>
-=======
 
 </html>
->>>>>>> master
