opus-tango/skills-resolve-merge-conflicts
1
0
Fork 0
mirror of https://github.com/opus-tango/skills-resolve-merge-conflicts.git synced 2026-03-20 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from GShadow5/my-resume

Browse Source 
Resolving merge conflicts
This commit is contained in:
Nayan Sawyer
2023-09-12 14:50:48 -04:00
committed by GitHub
parent 9e0a17d470 8331893ea5
commit e012851477
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
references.md
View File

@@ -1,3 +1,4 @@
# References # References
* octocat 1 😈 * octocat 1 😈
* We love merge conflicts!

2
resume.md
View File

@@ -2,7 +2,7 @@
Charting the knowledge of the Internet, just like Galileo charted the stars. Charting the knowledge of the Internet, just like Galileo charted the stars.
## Jobs ## Job History
### GitHub Trainer ### GitHub Trainer