Fixing merge issues

Packages/ohif-cornerstone/client/lib/classes/MetadataProvider.js

@@ -22,7 +22,6 @@ export class MetadataProvider {
         const instanceMetadata = data.instance;
         const seriesMetadata = data.series;
         const studyMetadata = data.study;
-        const imageIndex = data.imageIndex;
         const numImages = data.numImages;
 
         const metadata = {};
@@ -62,6 +61,15 @@ export class MetadataProvider {
         this.metadataLookup[imageId] = metadata;
     }
 
+    /**
+     * Return the metadata for the given imageId
+     * @param {String} imageId The Cornerstone ImageId
+     * @returns image metadata
+     */
+    getMetadata(imageId) {
+        return this.metadataLookup[imageId];
+    }
+
     /**
      * Adds a set of metadata to the Cornerstone metadata provider given a specific
      * imageId, type, and dataset
@@ -77,7 +85,6 @@ export class MetadataProvider {
         this.metadataLookup[imageId] = $.extend(this.metadataLookup[imageId], metadata);
     }
 
-
     getFromDataSet(dataSet, type, tag) {
         if (!dataSet) {
             return;
@@ -254,4 +261,4 @@ export class MetadataProvider {
             return imageMetadata[type];
         }
     }
-};
+}