mirror of https://github.com/perkeep/perkeep.git
Clean merge junk
Change-Id: Iff8fb872c2bddb178d019d103c6f56c28661c92f
This commit is contained in:
parent
88f068b009
commit
96d1784501
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue