Mercurial > hg > Game > Cerium

diff include/TaskManager/SchedExit.h @ 275:237a75ab7a9b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:12:47 +0900
parents ec6729fab209
children 7f991471d43f
line wrap: on
line diff
--- a/include/TaskManager/SchedExit.h	Thu Jun 04 00:08:48 2009 +0900
+++ b/include/TaskManager/SchedExit.h	Thu Jun 04 00:12:47 2009 +0900
@@ -17,13 +17,6 @@
 public:
     BASE_NEW_DELETE(SchedExit);
     
-<<<<<<< local
-    SchedExit(Scheduler *m) {
-	scheduler = m;
-    }
-
-=======
->>>>>>> other
     SchedTaskBase* next(Scheduler *, SchedTaskBase *);
 };