examples/rake_helper.rb in wukong-3.0.0.pre2 vs examples/rake_helper.rb in wukong-3.0.0.pre3

@@ -2,24 +2,36 @@
 require 'gorillib'
 require 'gorillib/data_munging'
 require 'pry'
 require 'rake'
 
+<<<<<<< HEAD
+PROJ_ROOT = (ENV['PROJ_CONTENTS'] || File.expand_path('..', File.dirname(__FILE__)))
+=======
 BOOK_ROOT = (ENV['BOOK_CONTENTS'] || File.expand_path('..', File.dirname(__FILE__)))
+>>>>>>> produce_consume
 
 Settings.define :mini, type: :boolean, default: false, description: "use sample data or full data?"
 Settings.resolve!
 Settings[:mini_slug] = Settings.mini ? "-sample" : ""
 
 # dummy dependency to force a task. TASK FORCE DELTA GO
 task :force
 
 Pathname.register_paths(
+<<<<<<< HEAD
+  proj_root: PROJ_ROOT,
+  root: [:proj_root],
+  code: [:proj_root, 'code'],
+  data: [:proj_root, 'data'],
+  work: [:proj_root, 'tmp'],
+=======
   book_root: BOOK_ROOT,
   root: [:book_root],
   code: [:book_root, 'code'],
   data: [:book_root, 'data'],
   work: [:book_root, 'tmp'],
+>>>>>>> produce_consume
   )
 
 require 'rake/name_space'
 module ::Rake
   class NameSpace