Skip to content

Xmg practice #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ximena9999 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Xmg practice #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c24bb8b
Update file to show branch edits
Ximena9999 Aug 10, 2021
9fe79f8
new update
Ximena9999 Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ The two moons may be a problem for Wolfman
But the mummy will appreciate the lack of humidity
Let's figure out how to get to Mars first

Conflict has been resolved by change both lines into this one.
This is a new line Ximena added to branch XMG-pratice on 8/10/2021.

This is another line added to branch XMG-practice.