Fix bad merge

pkg/dev_compiler/lib/js/legacy/dart_library.js

Index: pkg/dev_compiler/lib/js/legacy/dart_library.js
diff --git a/pkg/dev_compiler/lib/js/legacy/dart_library.js b/pkg/dev_compiler/lib/js/legacy/dart_library.js
index defc96aec9d0806cd35d46022282e10ff9b26f79..bbf0d4848a170310ab58e2e2772aeb309bc1f776 100644
--- a/pkg/dev_compiler/lib/js/legacy/dart_library.js
+++ b/pkg/dev_compiler/lib/js/legacy/dart_library.js
@@ -76,11 +76,7 @@ dart_library =
     loadImports() {
       let results = [];
       for (let name of this._imports) {
-        let lib = libraries.get(name);
-        if (!lib) {
-          throwLibraryError('Library not available: ' + name);
-        }
-        results.push(lib.load());
+        results.push(import_(name));
       }
       return results;
     }
@@ -170,14 +166,6 @@ dart_library =
   }
   dart_library.library = library;
 
-<<<<<<< HEAD
-  function import_(libraryName) {
-    let loader = libraries.get(libraryName);
-    // TODO(vsm): A user might call this directly from JS (as we do in tests).
-    // We may want a different error type.
-    if (!loader) throwLibraryError('Library not found: ' + libraryName);
-    return loader.load();
-=======
   // Maintain a stack of active imports.  If a requested library/module is not
   // available, print the stack to show where/how it was requested.
   let _stack = [];
@@ -199,7 +187,6 @@ dart_library =
     let result = lib.load();
     _stack.pop();
     return result;
->>>>>>> origin/master
   }
   dart_library.import = import_;