From 8299120b9b86ca42271f292ff4a3cdbd7ebfc604 Mon Sep 17 00:00:00 2001
From: Christian Back <cdirt27@gmail.com>
Date: Mon, 27 Sep 2021 12:33:53 -0500
Subject: [PATCH] making changes to create conflict in branch1

---
 src/components/App/App.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/App/App.jsx b/src/components/App/App.jsx
index 917b4df..12302ba 100755
--- a/src/components/App/App.jsx
+++ b/src/components/App/App.jsx
@@ -31,7 +31,7 @@ getImg();
         <header className="App-header">
           <h1 className="App-title">Gallery of My Life</h1>
         </header>
-        <p>Gallery goes here</p>
+        <p>Gallery goes somewhere</p>
    
         {/* <img src="images/goat_small.jpg"/> */}
         <GalleryList galleryData={galleryData} getImg={getImg}/>