Merge branch 'dev' of https://github.com/pattern-lab/patternlab-node into dev

bmuenzenmeyer · bmuenzenmeyer · commit ef23440d6aa8 · 2015-09-20T23:34:03.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ public/fonts/*
 public/js/*
 public/images/*
 public/patterns/*
-config.ini
 latest-change.txt
 patternlab.json
 .sass-cache/*
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -148,11 +148,11 @@
       //find pattern lineage
       lineage_hunter.find_lineage(currentPattern, patternlab);
 
-      //look for a pseudo pattern by checking if there is a file containing same name, with ~ in it, ending in .json
-      pseudopattern_hunter.find_pseudopatterns(currentPattern, patternlab);
-
       //add to patternlab object so we can look these up later.
       addPattern(currentPattern, patternlab);
+
+      //look for a pseudo pattern by checking if there is a file containing same name, with ~ in it, ending in .json
+      pseudopattern_hunter.find_pseudopatterns(currentPattern, patternlab);
     }
 
     function getpatternbykey(key, patternlab){
diff --git a/source/Thumbs.db b/source/Thumbs.db
