even more merge fixups

gartung · gartung · commit f42ff748818f · 2016-06-22T16:17:34.000-05:00
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -862,8 +862,8 @@ def do_install(self,
                    verbose=False,
                    make_jobs=None,
                    fake=False,
-                   explicit=False,
-                   install_policy="build"):
+                   install_policy="build",
+                   explicit=False):
         """Called by commands to install a package and its dependencies.
 
         Package implementations should override install() to describe
