# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1244457627 -32400
# Node ID 8ec2f3e61ee10b4dfe3fc9a9cb5126e46ea98769
# Parent  2ac66db4dd11b2a83026ad384e5798da21d3aac2
minor fix

diff -r 2ac66db4dd11 -r 8ec2f3e61ee1 example/many_task/Makefile.def
--- a/example/many_task/Makefile.def	Mon Jun 08 19:36:48 2009 +0900
+++ b/example/many_task/Makefile.def	Mon Jun 08 19:40:27 2009 +0900
@@ -4,11 +4,6 @@
 # ex  macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
 
-<<<<<<< local
-# ex  linux/ps3
-=======
-# ex: linux/ps3
->>>>>>> other
 CERIUM = ../../../Cerium
 
 CC      = g++