changeset 1397:cb5bced85a14 draft

minor change.
author e095732 <e095732@ie.u-ryukyu.ac.jp>
date Tue, 31 Jan 2012 17:15:16 +0900
parents ad841dcdbe67
children e19296785c07
files Renderer/Test/ball_bound.cc
diffstat 1 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/ball_bound.cc	Tue Jan 31 17:10:53 2012 +0900
+++ b/Renderer/Test/ball_bound.cc	Tue Jan 31 17:15:16 2012 +0900
@@ -115,14 +115,7 @@
     // random な値が欲しいなら、man random に方法が書いてあります。
     srandom(100);
 
-<<<<<<< local
-    sgroot->createFromXMLfile("xml_file/Ball.xml");
-    //    sgroot->createFromXMLfile("/Users/YuSUGIMOTO/Desktop/sample.xml");
-=======
     sgroot->createFromXMLfile("./xml_file/Ball.xml");
-    //sgroot->createFromXMLfile("/Users/YuSUGIMOTO/Desktop/sample.xml");
->>>>>>> other
-
     sgroot->OnLightSysSwitch();
 
     SceneGraphPtr light = sgroot->getLight(0);