Merge branch 'master' of github.com:yarnpkg/yarn

yarnpkg · Oct 15, 2016 · b5087a2 · b5087a2
2 parents cefa9a3 + 383273c
commit b5087a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/registries/npm-registry.js b/src/registries/npm-registry.js
@@ -87,9 +87,9 @@ export default class NpmRegistry extends Registry {
 
   async getPossibleConfigLocations(filename: string): Promise<Array<[boolean, string, string]>> {
     const possibles = [
-      [false, path.join(getGlobalPrefix(), filename)],
-      [true, path.join(userHome, filename)],
       [false, path.join(this.cwd, filename)],
+      [true, path.join(userHome, filename)],
+      [false, path.join(getGlobalPrefix(), filename)],
     ];
 
     const foldersFromRootToCwd = this.cwd.split(path.sep);