LizCarter492 · rzfatemeh · Sep 12, 2024 · Sep 13, 2024 · Sep 17, 2024 · Oct 1, 2024
diff --git a/CodeSprints/CoordinateReferenceSystem.ipynb b/CodeSprints/CoordinateReferenceSystem.ipynb
diff --git a/CodeSprints/FeatureDependence.ipynb b/CodeSprints/FeatureDependence.ipynb
diff --git a/CodeSprints/ObservationDependence.ipynb b/CodeSprints/ObservationDependence.ipynb
diff --git a/CodeSprints/Python101_solutions.ipynb b/CodeSprints/Python101_solutions.ipynb
diff --git a/CodeSprints/RasterData101.ipynb b/CodeSprints/RasterData101.ipynb
diff --git a/CodeSprints/VectorData101.ipynb b/CodeSprints/VectorData101.ipynb
diff --git a/CodeSprints/ode_to_git.txt b/CodeSprints/ode_to_git.txt
@@ -3,6 +3,15 @@ You confuse me now,
 so later I may be less confused.
 But what is the value of such a quest
 if here and now I stand abused?
+<<<<<<< HEAD
+I treated you well, but you gave me error.
+Don't forget, you are created to make life easier
+=======
 
 hello git!
-it is a joy to use you now
+<<<<<<< HEAD
+it is a joy to use you now
+>>>>>>> upstream/main
+=======
+it is a joy to use you now
+>>>>>>> upstream/main
diff --git a/CodeSprints/regression101.ipynb b/CodeSprints/regression101.ipynb
diff --git a/Python/chapters/chapter_5_classification.ipynb b/Python/chapters/chapter_5_classification.ipynb