--- a/TaskManager/Test/test_render/Application/dynamic_create.cc	Wed Oct 21 21:05:34 2009 +0900
+++ b/TaskManager/Test/test_render/Application/dynamic_create.cc	Thu Oct 22 01:31:09 2009 +0900
@@ -102,18 +102,12 @@
 	node->stack_xyz[1] = -node->stack_xyz[1];
     }
     
-<<<<<<< local
     //Pad *pad = sgroot->getController();
-=======
-    Pad *pad = sgroot->getController();
-<<<<<<< local
+ 
+    /*
     if (pad->circle.isPush()) {
 	SceneGraphPtr earth;
 	sgroot->createFromXMLmemory(sgroot->tmanager, "xml_file/universe.xml");
-=======
->>>>>>> other
-
-    /*
     if (pad->right.isPush()) {
         SceneGraphPtr earth;	
 	
@@ -121,7 +115,6 @@
 
 	//sgroot->createFromXMLmemory(sgroot->tmanager, "xml_file/universe.xml");
 	sgroot->createFromXMLmemory(sgroot->tmanager, m);
->>>>>>> other
 	earth = sgroot->createSceneGraph("Earth");
 	earth->set_move_collision(moon_move, moon_collision);
 	node->addChild(earth);
@@ -170,7 +163,7 @@
 {
     init_linda();
     callback_arg *carg = (callback_arg *)manager->allocate(sizeof(callback_arg));
-    carg->tid = open_linda_java("cycas.cr.ie.u-ryukyu.ac.jp", PORT);
+    carg->tid = open_linda_java("133.13.59.231", PORT);
     carg->read_id = 10;
     carg->node = node;
     psx_callback_wait_rd(carg->tid, carg->read_id, callbacker, carg);