yet another conflict resolving attempt

d3scomp · Dec 2, 2013 · 459751c · 459751c
1 parent 6886471
commit 459751c
Show file tree

Hide file tree

Showing 2 changed files with 759 additions and 0 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/.gitignore b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/.gitignore
@@ -0,0 +1 @@
+/LocalTimeScheduler.java