[supybot-gribble/f15] fixing diverging branches

[Dave Riches]

commit dcf1e9a2359555e0e4e3bdb1f3cf248cfd8c0dbf
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 13:26:47 2011 +0100

    fixing diverging branches

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40cb4b9..1431feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+/supybot-gribble-20110627.tar
 /supybot-gribble-20111016.tar
diff --git a/sources b/sources
index ee150a8..9aca118 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d48242a278deab6fed94ddf7915749  supybot-gribble-20111016.tar
+98d48242a278deab6fed94ddf7915749  supybot-gribble-20111016.tar