Merge branch 'main' of https://github.com/IronRiders/software-team

IronRiders · Jul 23, 2024 · eb4295a · eb4295a
2 parents 240ff7b + 7922e92
commit eb4295a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/java/week-4-practice-project.md b/java/week-4-practice-project.md
@@ -6,8 +6,13 @@
 
 ### 4.2 Two Dimensional Arrays
 
+<<<<<<< HEAD
 [Lesson](https://www.codecademy.com/courses/learn-java/lessons/2-d-arrays-java)  
 [Cheatsheet](https://www.codecademy.com/learn/learn-java/modules/java-two-dimensional-arrays/cheatsheet)
+=======
+Lesson: https://www.codecademy.com/courses/learn-java/lessons/2-d-arrays-java  
+Cheatsheet: https://www.codecademy.com/learn/learn-java/modules/java-two-dimensional-arrays/cheatsheet
+>>>>>>> 7922e92f867f33bfa9b88b811521a934f8c16c37
 
 [w3Schools Arrays](https://www.w3schools.com/java/java_arrays.asp)