[blam] Item: Add reference counting

[Carlos Martín Nieto <cmartin src gnome org>]

commit a563a1f71e143bbf5e0612a6d8830d08828767ce
Author: Carlos Martín Nieto <carlos cmartin tk>
Date:   Mon Oct 11 20:16:23 2010 +0100

    Item: Add reference counting

 src/Item.cs |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/src/Item.cs b/src/Item.cs
index 3b9b494..916a47e 100644
--- a/src/Item.cs
+++ b/src/Item.cs
@@ -105,7 +105,6 @@ namespace Imendio.Blam {
                     case "keywords":
                         Keywords = ext.GetObject<string>();
                         break;
-<<<<<<< HEAD
                     case "refcount":
                         ref_cnt = ext.GetObject<int>();
                         break;