Skip to content

Commit

Permalink
Add resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
judy0ye committed Oct 18, 2023
1 parent ffd224c commit 468f8ec
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/PuzzleThree/PuzzleThree.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export default function PuzzleThree({
<p>{incorrect}</p>
<h2>Riddle</h2>
<p>
"I come from a place beyond the stars, With shiny ships that blink near
and far. You've seen me in movies, books, and more, Do you know what I
am, or are you unsure?"
"We come from a place beyond the stars, With shiny ships that blink near
and far. You've seen us in movies, books, and more, Do you know what we
are, or are you unsure?"
</p>
<input
type="text"
Expand Down

0 comments on commit 468f8ec

Please sign in to comment.