Update

dmcleanAtStsci · dmcleanAtStsci · commit b88abf551633 · 2023-05-10T14:34:46.000-04:00
diff --git a/mars.txt b/mars.txt
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
+This PLANET is Curious, but I have to Persevere cause this may be our first Opportunity
+=======
 This planet is Curious, but we have to Persevere because this may be our last Opportunity
 The Mars movement of Holst's Planets symphony is considered to be one of the more dramatic parts of that work.
+>>>>>>> bdef723ab70a9d27b38a030d35fac870191cb432
diff --git a/neptune.txt b/neptune.txt
@@ -1 +1,2 @@
+The 2nd to last planet from the Sun. Depending on which decade you're asking.
 Named after the Romand god of the seas.

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+The 2nd to last planet from the Sun. Depending on which decade you're asking.`
`1`	`2`	`Named after the Romand god of the seas.`