mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-29 00:26:10 +03:00
Code Issues Projects Releases Wiki Activity

One extra merge conflict

Browse Source
This commit is contained in:
Ian Gilman 2014-11-07 17:15:11 -08:00
parent 30a1005fb8
commit 7fcdbf210e
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawer.js
View File

@ -36,12 +36,6 @@
/** /**
* @class Drawer * @class Drawer
<<<<<<< HEAD
=======
* @classdesc Handles rendering of tiles for an {@link OpenSeadragon.Viewer}.
* A new instance is created for each TileSource opened (see {@link OpenSeadragon.Viewer#drawer}).
*
>>>>>>> master
* @memberof OpenSeadragon * @memberof OpenSeadragon
* @classdesc Handles rendering of tiles for an {@link OpenSeadragon.Viewer}. * @classdesc Handles rendering of tiles for an {@link OpenSeadragon.Viewer}.
* @param {Object} options - Options for this Drawer. * @param {Object} options - Options for this Drawer.