From 3943d2d6798e8ce9e418bdd7e905a1cae891c146 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Thu, 24 Dec 2009 17:40:49 +0000
Subject: [PATCH] Reverted test merge

---
 hm.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/hm.py b/hm.py
index 85b6f173..4941f417 100644
--- a/hm.py
+++ b/hm.py
@@ -1,12 +1,5 @@
 #! /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.