From 96d178450135f189d20fcdddf705a88079e9922a Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Sun, 20 Jan 2013 15:48:19 -0800
Subject: [PATCH] Clean merge junk

Change-Id: Iff8fb872c2bddb178d019d103c6f56c28661c92f
---
 server/camlistored/newui/blob_item_container.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/camlistored/newui/blob_item_container.js b/server/camlistored/newui/blob_item_container.js
index 7edcc2233..1ec0d3663 100644
--- a/server/camlistored/newui/blob_item_container.js
+++ b/server/camlistored/newui/blob_item_container.js
@@ -56,7 +56,6 @@ camlistore.BlobItemContainer.THUMBNAIL_SIZES_ = [25, 50, 75, 100, 150, 200];
 
 
 /**
-<<<<<<< HEAD
  * @type {goog.events.FileDropHandler}
  * @private
  */