Fix bad merge

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

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /* This file defines the module loader for the dart runtime.
 */
 var dart_library;
 if (!dart_library) {
 dart_library =
   typeof module != "undefined" && module.exports || {};
@@ skipping 58 matching lines @@
       this._imports = imports;
       this._loader = loader;
 
       // Cyclic import detection
       this._state = LibraryLoader.NOT_LOADED;
     }
 
     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;
     }
 
     load() {
       // Check for cycles
       if (this._state == LibraryLoader.LOADING) {
         throwLibraryError('Circular dependence on library: '
                               + this._name);
       } else if (this._state >= LibraryLoader.READY) {
@@ skipping 69 matching lines @@
     if (result) {
       console.log('Re-loading ' + name);
       _invalidateLibrary(name);
     }
     result = new LibraryLoader(name, defaultValue, imports, loader);
     _libraries.set(name, result);
     return result;
   }
   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 = [];
   function import_(name) {
     let lib = _libraries.get(name);
     if (!lib) {
       let message = 'Module ' + name + ' not loaded in the browser.';
       if (_stack != []) {
         message += '\nDependency via:';
         let indent = '';
         for (let last = _stack.length - 1; last >= 0; last--) {
           indent += ' ';
           message += '\n' + indent + '- ' + _stack[last];
         }
       }
       throwLibraryError(message);
     }
     _stack.push(name);
     let result = lib.load();
     _stack.pop();
     return result;
->>>>>>> origin/master
   }
   dart_library.import = import_;
 
   var _currentIsolate = false;
 
   function _restart() {
     start(_lastModuleName, _lastLibraryName, true);
   }
 
   function reload() {
@@ skipping 49 matching lines @@
     } else {
       // If not a reload then store the initial html to reset it on reload.
       _originalBody = document.body.cloneNode(true);
     }
     library.main();
   }
   dart_library.start = start;
 
 })(dart_library);
 }