From 412f629be0c234185d426fefc2d7c85c8a35ed42 Mon Sep 17 00:00:00 2001
From: Nigel <84653162+ShigeoDev@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:56:55 -0400
Subject: [PATCH 1/5] task 1

---
 src/DataTypes.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DataTypes.java b/src/DataTypes.java
index 4f807c1f..eebcb595 100644
--- a/src/DataTypes.java
+++ b/src/DataTypes.java
@@ -4,7 +4,7 @@ public class DataTypes {
     // TODO TASK 1: fix this code so that it passes the test in DataTypesTest.java
     public static long sum(List<Integer> numbers) {
 
-        int s = 0;
+        long s = 0;
         // below is a "foreach" loop which iterates through numbers
         for (int x : numbers) {
             s += x;

From ec8fa79d7a868f60d2edfb446fadc3711dc9e332 Mon Sep 17 00:00:00 2001
From: Nigel <84653162+ShigeoDev@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:01:46 -0400
Subject: [PATCH 2/5] alice

---
 recipe.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipe.md b/recipe.md
index a8b51a4d..818b7fde 100644
--- a/recipe.md
+++ b/recipe.md
@@ -4,9 +4,15 @@
 - 2 cups all-purpose flour
 - 1 3/4 cups granulated sugar
 - 3/4 cup unsweetened cocoa powder
-- ...
+- 1 cup chocolate chips
+- 1 tsp vanilla extract
 
 ## Instructions:
 1. Preheat the oven to 350°F (175°C).
 2. In a large bowl, whisk together the flour, sugar, and cocoa powder.
-3. ...
\ No newline at end of file
+3. ...
+
+## Additional Directions by Alice:
+4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined.
+5. Gradually add the milk and vegetable oil to the mixture, continuing to stir.
+6. Pour the batter into a greased and floured 9x13-inch baking pan.

From c438f642e34e22448fb1fb04b1a190124bd5afa8 Mon Sep 17 00:00:00 2001
From: Nigel <84653162+ShigeoDev@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:02:36 -0400
Subject: [PATCH 3/5] bob

---
 recipe.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipe.md b/recipe.md
index a8b51a4d..d8cb4976 100644
--- a/recipe.md
+++ b/recipe.md
@@ -4,9 +4,15 @@
 - 2 cups all-purpose flour
 - 1 3/4 cups granulated sugar
 - 3/4 cup unsweetened cocoa powder
+- 1/2 tsp ground cinnamon
 - ...
 
 ## Instructions:
 1. Preheat the oven to 350°F (175°C).
 2. In a large bowl, whisk together the flour, sugar, and cocoa powder.
-3. ...
\ No newline at end of file
+3. ...
+
+## Additional Directions by Bob:
+4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor.
+5. Mix in a handful of chocolate chunks for extra indulgence.
+6. Line the bottom of the baking pan with parchment paper for easy cake removal.

From 40813462347e4938a0b025abd7499973cfc080c3 Mon Sep 17 00:00:00 2001
From: Nigel <84653162+ShigeoDev@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:05:09 -0400
Subject: [PATCH 4/5] merge

---
 recipe.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/recipe.md b/recipe.md
index 73f38a79..48ebbdbb 100644
--- a/recipe.md
+++ b/recipe.md
@@ -4,27 +4,15 @@
 - 2 cups all-purpose flour
 - 1 3/4 cups granulated sugar
 - 3/4 cup unsweetened cocoa powder
-<<<<<<< HEAD
-- 1 cup chocolate chips
-- 1 tsp vanilla extract
-=======
 - 1/2 tsp ground cinnamon
 - ...
->>>>>>> bob
 
 ## Instructions:
 1. Preheat the oven to 350°F (175°C).
 2. In a large bowl, whisk together the flour, sugar, and cocoa powder.
 3. ...
 
-<<<<<<< HEAD
 ## Additional Directions by Alice:
 4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined.
 5. Gradually add the milk and vegetable oil to the mixture, continuing to stir.
 6. Pour the batter into a greased and floured 9x13-inch baking pan.
-=======
-## Additional Directions by Bob:
-4. Add a tablespoon of instant coffee to the dry ingredients for a hint of mocha flavor.
-5. Mix in a handful of chocolate chunks for extra indulgence.
-6. Line the bottom of the baking pan with parchment paper for easy cake removal.
->>>>>>> bob

From 8814b5ddd75daf7a0335da4212d2f1465814abe3 Mon Sep 17 00:00:00 2001
From: Nigel <84653162+ShigeoDev@users.noreply.github.com>
Date: Mon, 16 Sep 2024 12:14:05 -0400
Subject: [PATCH 5/5] task3

---
 recipe.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipe.md b/recipe.md
index 48ebbdbb..431036e3 100644
--- a/recipe.md
+++ b/recipe.md
@@ -16,3 +16,5 @@
 4. In a separate bowl, beat the eggs and add them to the mixture. Stir until well combined.
 5. Gradually add the milk and vegetable oil to the mixture, continuing to stir.
 6. Pour the batter into a greased and floured 9x13-inch baking pan.
+
+## Finished