Skip to content

BarbaraShea/conflict-resolution

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

5 Commits
 
 

Repository files navigation

conflict-resolution

GitHUB

This is text from GH

<<<<<<< HEAD This is my text on my machine

These are new changes.

b03c643b64e866d7b7c0a0691dcb924222600d1a

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published