Undo changes from patrick_branch merge

katherineperks · katherineperks · commit 6e26e39bd4b3 · 2022-06-29T12:12:58.000-07:00
diff --git a/some_file.txt b/some_file.txt
@@ -3,4 +3,3 @@ Some change katherine has made
 Another change katherine has made
 
 This is some new change on "Parent" that can be pulled down
-Some change patrick has made

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@ Some change katherine has made`
`3`	`3`	`Another change katherine has made`
`4`	`4`
`5`	`5`	`This is some new change on "Parent" that can be pulled down`
`6`		`-Some change patrick has made`