Merge branch 'master' into parallel_conflict_with_diffy

ahayworth · web-flow · commit b886740e4c88 · 2019-10-29T23:13:47.000-05:00
diff --git a/README.md b/README.md
@@ -83,4 +83,4 @@ It requires 3rd party ruby gems found [here](/vendor/cache). It also includes po
 
 ## Authors / Owners
 
-`octocatalog-diff` was originally designed and authored by [Kevin Paulisse](https://github.com/kpaulisse), and is now maintained by the Site Reliability Engineering team at GitHub.
+`octocatalog-diff` was originally designed and authored by [Kevin Paulisse](https://github.com/kpaulisse). It is now maintained by the Site Reliability Engineering team at GitHub.

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,4 @@ It requires 3rd party ruby gems found [here](/vendor/cache). It also includes po`
`83`	`83`
`84`	`84`	`## Authors / Owners`
`85`	`85`
`86`		-`octocatalog-diff` was originally designed and authored by [Kevin Paulisse](https://github.com/kpaulisse), and is now maintained by the Site Reliability Engineering team at GitHub.
	`86`	+`octocatalog-diff` was originally designed and authored by [Kevin Paulisse](https://github.com/kpaulisse). It is now maintained by the Site Reliability Engineering team at GitHub.