resolved conflict
This commit is contained in:
commit
efd64f4819
File diff suppressed because one or more lines are too long
|
|
@ -87,7 +87,7 @@ export default {
|
|||
this.activeImage.removeData('elevateZoom');
|
||||
|
||||
/* getting url */
|
||||
this.activeImageVideoURL = largeImageUrl;
|
||||
this.activeImageVideoURL = smallImageUrl;
|
||||
|
||||
/* type checking for media type */
|
||||
this.currentType = currentType;
|
||||
|
|
|
|||
Loading…
Reference in New Issue