From ed1c0d41cda0e4cbae818127c1fc4a8dfb0102fe Mon Sep 17 00:00:00 2001
From: MccDom1 <mcclaneydominique@gmail.com>
Date: Wed, 8 Apr 2026 19:54:10 -0400
Subject: [PATCH 1/2] Added Dominique bash script

---
 dominique.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 dominique.sh

diff --git a/dominique.sh b/dominique.sh
new file mode 100644
index 0000000..ee5d29a
--- /dev/null
+++ b/dominique.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Welcome, Dominique McClaney"
+

From 8775b624770ecd20db86b252557fee0600b56656 Mon Sep 17 00:00:00 2001
From: MccDom1 <mcclaneydominique@gmail.com>
Date: Wed, 8 Apr 2026 21:13:59 -0400
Subject: [PATCH 2/2] Parallel branch edit for conflict

---
 02-add_nums.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/02-add_nums.sh b/02-add_nums.sh
index 2fd13cb..0cd4fc7 100644
--- a/02-add_nums.sh
+++ b/02-add_nums.sh
@@ -13,3 +13,5 @@ echo "The sum is $sum"
 
 # exercise: ask the user for the width and height and present total
 # number of pixels
+
+echo "This is my PARALLEL branch version"
\ No newline at end of file