From 848ff998681090c9b99095165628bc4ed1cec5dc Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Thu, 24 Dec 2009 17:40:06 +0000
Subject: [PATCH] Test merge

---
 hm.py | 5 +++++
 1 file changed, 5 insertions(+)

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