Skip to content

Instantly share code, notes, and snippets.

@gotbahn

gotbahn/conflict.css

Created February 6, 2021 22:26
Show Gist options
  • Save gotbahn/0d171f2bafb14697e9aa4c288f6cfb48 to your computer and use it in GitHub Desktop.
Save gotbahn/0d171f2bafb14697e9aa4c288f6cfb48 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
conflict.css
.component {
<<<<<<< HEAD
padding: 1em 0.5em 3em;
=======
padding: 2em 0.5em 1em;
>>>>>>> my-branch
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment