factor: fixing merge errors, paths, etc.

core/bootstrap/stage1.factor

@@ -53,7 +53,7 @@ load-help? off
 
         init-resource-path
 
-        "resource:basis/bootstrap/stage2.factor"
+        "resource:language/bootstrap/stage2.factor"
         dup exists? [
             run-file
         ] [

core/vocabs/loader/loader.factor

@@ -12,8 +12,17 @@ SYMBOL: add-vocab-root-hook
 [
     V{
         "resource:core"
-        "resource:basis"
-        "resource:extra"
+        "resource:language"
+        "resource:collections"
+        "resource:ffi"
+        "resource:libs"
+        "resource:frameworks"
+        "resource:apps"
+        "resource:tools"
+        "resource:webapps"
+        "resource:games"
+        "resource:demos"
+        "resource:benchmarks"
         "resource:work"
     } clone vocab-roots set-global
 

libs/colors/constants/constants.factor

@@ -17,9 +17,9 @@ IN: colors.constants
     [ parse-color ] H{ } map>assoc ;
 
 MEMO: colors ( -- assoc )
-    "resource:basis/colors/constants/rgb.txt"
-    "resource:basis/colors/constants/factor-colors.txt"
-    "resource:basis/colors/constants/solarized-colors.txt"
+    "vocab:colors/constants/rgb.txt"
+    "vocab:colors/constants/factor-colors.txt"
+    "vocab:colors/constants/solarized-colors.txt"
     [ utf8 file-lines parse-colors ] tri@ assoc-union assoc-union ;
 
 PRIVATE>