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 branch 'main' into my-resume

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

5
references.md
View File

@@ -1,3 +1,4 @@
Lorem ipsum etcetra :) # References
We love merge conflicts! * octocat 1 😈
* We love merge conflicts!