[blam] Temporary fix for context:encoded

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

commit eb83dcc76fb9c185a8f2a46a97dcc229518cdbbe
Author: Carlos Martín Nieto <carlos cmartin tk>
Date:   Mon Oct 11 13:32:43 2010 +0100

    Temporary fix for context:encoded

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