Fix merge errors

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/handlebars/runtime.js b/lib/handlebars/runtime.js
index eeef182..4604312 100644
--- a/lib/handlebars/runtime.js
+++ b/lib/handlebars/runtime.js
@@ -3,18 +3,18 @@ import { COMPILER_REVISION, REVISION_CHANGES } from "./base";
 
 function checkRevision(compilerInfo) {
   var compilerRevision = compilerInfo && compilerInfo[0] || 1,
-      currentRevision = Handlebars.COMPILER_REVISION;
+      currentRevision = COMPILER_REVISION;
 
   if (compilerRevision !== currentRevision) {
     if (compilerRevision < currentRevision) {
-      var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
-          compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
-      throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
-            "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
+      var runtimeVersions = REVISION_CHANGES[currentRevision],
+          compilerVersions = REVISION_CHANGES[compilerRevision];
+      throw new Error("Template was precompiled with an older version of Handlebars than the current runtime. "+
+            "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
     } else {
       // Use the embedded version info since the runtime doesn't know about this revision yet
-      throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
-            "Please update your runtime to a newer version ("+compilerInfo[1]+").";
+      throw new Error("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+            "Please update your runtime to a newer version ("+compilerInfo[1]+").");
     }
   }
 }
@@ -76,7 +76,7 @@ export function template(templateSpec, Hbars, compile) {
 
   return function(context, options) {
     options = options || {};
-    var namespace = options.partial ? options : Handlebars,
+    var namespace = options.partial ? options : Hbars,
         helpers,
         partials;