modified file in update-world branch and now trying to merge back

lorihollasch · Nov 29, 2018 · 077482e · 077482e
1 parent 356a78a
commit 077482e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,4 +2,5 @@
 intro to git
 Hi there. I'm finally getting an opportunity to learn Git and GitHub - so exciting!
 On a personal note, I love the free pickles in Msft cafeterias - yum.
-this is in the dev branch
+
+Making a change on the local update-world branch