Merge PR #3 (test/merge)

bearpress · web-flow · commit 2bc0733d94a2 · 2019-10-20T18:27:31.000-07:00
Testing the merge update strategy.
diff --git a/README.md b/README.md
@@ -2,4 +2,8 @@
 
 > An awesome collaborative project to teach you the contributor workflow.
 
-This repository is for the [Git Contributing](https://knowthecode.io/labs/git-contributing) hands-on coding lab.
+This repository is for the [Git Contributing](https://knowthecode.io/labs/git-contributing) hands-on coding lab.
+
+I'm testing the merge update stratedgyu.
+
+I'm continuing  to work on this file.
diff --git a/bootstrap.php b/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Launches the Git Contributing plugin for you to enjoy.
+ * Launches the Git Contributing plugin for you to enjoy while learning about git.
  *
  * @package     KnowTheCode\GitContributing
  * @author      hellofromTonya

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/**`
`3`		`- * Launches the Git Contributing plugin for you to enjoy.`
	`3`	`+ * Launches the Git Contributing plugin for you to enjoy while learning about git.`
`4`	`4`	`*`
`5`	`5`	`* @package KnowTheCode\GitContributing`
`6`	`6`	`* @author hellofromTonya`