@@ -7,13 +7,8 @@ task :doc do pdoc = 'lib/pdoc/lib/pdoc' unless File.exists?(pdoc) puts "\nYou'll need PDoc to generate the documentation. Just run:\n\n" -<<<<<<< HEAD:Rakefile puts " $ git submodule init" puts " $ git submodule update" -======= - puts " $ git submodule init" - puts " $ git submodule update" ->>>>>>> ZenCocoon/master:Rakefile puts "\nand you should be all set.\n\n" end Rakefile 8d6a499020811d539baf4e3acaf2117d21f345c5 sgruhier sgruhier@mac.com http://github.com/xilinus/protofx/commit/ad698f7579c750a771e7b201865417f9ff394fc4 ad698f7579c750a771e7b201865417f9ff394fc4 2008-12-15T09:37:02-08:00 2008-12-15T09:37:02-08:00 fix conflict 23c065d03611cc532b7b5a90338f3abdf468af9d sgruhier sgruhier@mac.com