# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1291734331 -32400
# Node ID 150412ed980a534609bf76b47098cca227d8bfcd
# Parent  283b15633c0f7b6a3b06318b9e7f7f44ab7b0689
minor fix

diff -r 283b15633c0f -r 150412ed980a Renderer/Engine/Application.h
--- a/Renderer/Engine/Application.h	Wed Dec 08 00:04:02 2010 +0900
+++ b/Renderer/Engine/Application.h	Wed Dec 08 00:05:31 2010 +0900
@@ -15,11 +15,7 @@
     Application();
     virtual ~Application();
 
-<<<<<<< local
-    virtual bool app_main(Viewer *viewer){ return 1; /* use all execute */ };
-=======
-    virtual void app_loop(Viewer *viewer){};
->>>>>>> other
+    virtual bool app_loop(Viewer *viewer){ return 1; /* use all execute */ };
     virtual HTaskPtr application_task(HTaskPtr next, Viewer* viewer){return next;};
     virtual MainLoopPtr init(Viewer *viewer, int w, int h)  = 0;
 };