Skip to content

Instantly share code, notes, and snippets.

@goozbach

goozbach/gist:269754

Created January 5, 2010 21:34
Show Gist options
  • Save goozbach/269754 to your computer and use it in GitHub Desktop.
Save goozbach/269754 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1
<<<<<<< TREE
#: bin/byobu-config:131 bin/byobu-config:165 bin/byobu-config:182
#: bin/byobu-config:216 bin/byobu-config:355 bin/byobu-config:396
#: bin/byobu-config:469
=======
#: byobu-config:110 byobu-config:144 byobu-config:161 byobu-config:195
#: byobu-config:335 byobu-config:376 byobu-config:449
>>>>>>> MERGE-SOURCE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment