[DEECo] [d3scomp/JDEECo] b4146b: sorry guys, I have to do this because of the line ...

[GitHub]

  Branch: refs/heads/newgen-muradyan
  Home:   https://github.com/d3scomp/JDEECo
  Commit: b4146b648f711ef1b2e789d42a4ef1f500512276
      https://github.com/d3scomp/JDEECo/commit/b4146b648f711ef1b2e789d42a4ef1f500512276
  Author: Andranik Muradyan <muradian at d3s.mff.cuni.cz>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  sorry guys, I have to do this because of the line ending conflict