[supybot-gribble/f14] fixing diverging branches

[Dave Riches]

commit 11c6850c686ec05cec452ecbbc4940a9262ca0d3
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 13:20:00 2011 +0100

    fixing diverging branches

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75844a6..1431feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
 /supybot-gribble-20110627.tar
-<<<<<<< HEAD
-=======
 /supybot-gribble-20111016.tar
->>>>>>> master