Merge pull request #5 from VirginiaTech/dev

forteddyt · web-flow · commit 4f42e39e3003 · 2017-11-29T19:57:58.000-05:00
Dev Update
diff --git a/MergeConflict.txt b/MergeConflict.txt
@@ -0,0 +1,6 @@
+Welcome to the GitHub Workshop!
+We'll explore one of the most dreaded - but inevitable - things in Git... Merge Conflicts!
+
+Everyone should change the following sentance with thier own thing:
+
+I am [(name)] and my favorite programming language is [(language)].
diff --git a/Person1.txt b/Person1.txt
@@ -0,0 +1,4 @@
+Welcome to the GitHub Workshop!
+You must be Person 1. Make some changes to this file, like maybe writing a story, telling a joke, writing code... anything, really.
+
+
diff --git a/Person2.txt b/Person2.txt
@@ -0,0 +1,4 @@
+Welcome to the GitHub Workshop!
+You must be Person 2. Make some changes to this file, like maybe writing a story, telling a joke, writing code... anything, really.
+
+
diff --git a/Person3.txt b/Person3.txt
@@ -0,0 +1,4 @@
+Welcome to the GitHub Workshop!
+You must be Person 3. Make some changes to this file, like maybe writing a story, telling a joke, writing code... anything, really.
+
+
diff --git a/workshop.txt b/workshop.txt
diff --git a/workshop2.txt b/workshop2.txt
