resolving a conflict and accepting original.

HackYourFuture-CPH · May 1, 2024 · 244f88e · 244f88e
2 parents c748dd6 + 37a3f02
commit 244f88e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/2_git/week2/veggies.txt b/2_git/week2/veggies.txt
@@ -1,7 +1,7 @@
-- Tomato
-- Onion
-- Bell pepper
-- Cucumber
-- Lettus
-- Potato
-- Carrot
+Carrots
+Broccoli
+Zucchini
+Bell peppers
+Tomatoes
+Cucumber
+Onions