mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-20 16:53:14 +03:00
Code Issues Projects Releases Wiki Activity

Remove merge marks.

Browse Source
This commit is contained in:
Aiosa 2024-02-05 09:47:10 +01:00
parent 9ef2d46e75
commit a97fe34d74
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tiledimage.js
View File

@ -1879,7 +1879,6 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
}, },
/** /**
<<<<<<< HEAD
* @private * @private
* @inner * @inner
* Try to find existing cache of the tile * Try to find existing cache of the tile
@ -1920,8 +1919,6 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
/** /**
* @private * @private
* @inner * @inner
=======
>>>>>>> origin
* Obtains a tile at the given location. * Obtains a tile at the given location.
* @private * @private
* @param {Number} x * @param {Number} x