rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test merge

This commit is contained in:
Nick Bolton 2009-12-24 17:40:06 +00:00
parent f83c2ee46d
commit 848ff99868
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hm.py
View File

@ -1,7 +1,12 @@
#! /usr/bin/env python #! /usr/bin/env python
<<<<<<< .working
# test 2 # test 2
=======
# test 1
>>>>>>> .merge-right.r259
# hm.py: 'Help Me', is a simple wrapper for `cmake` and `hg`. # hm.py: 'Help Me', is a simple wrapper for `cmake` and `hg`.
# #
# This script was created for the Synergy+ project. # This script was created for the Synergy+ project.