Clean merge junk

Change-Id: Iff8fb872c2bddb178d019d103c6f56c28661c92f
This commit is contained in:
Brad Fitzpatrick 2013-01-20 15:48:19 -08:00
parent 88f068b009
commit 96d1784501
1 changed files with 0 additions and 1 deletions

View File

@ -56,7 +56,6 @@ camlistore.BlobItemContainer.THUMBNAIL_SIZES_ = [25, 50, 75, 100, 150, 200];
/** /**
<<<<<<< HEAD
* @type {goog.events.FileDropHandler} * @type {goog.events.FileDropHandler}
* @private * @private
*/ */