Merged logic into master

[Mograsim.git] / era.mi / src / era / mi / logic / Simulation.java

diff --git a/era.mi/src/era/mi/logic/Simulation.java b/era.mi/src/era/mi/logic/Simulation.java
index 6490613..0468ec1 100644 (file)
--- a/era.mi/src/era/mi/logic/Simulation.java
+++ b/era.mi/src/era/mi/logic/Simulation.java
@@ -1,10 +1,9 @@
-package era.mi.logic;\r
-\r
-import era.mi.logic.timeline.Timeline;\r
-\r
-public class Simulation {\r
-       public final static Timeline TIMELINE = new Timeline(11);\r
-\r
-       public static void main(String[] args) {\r
-       }\r
+package era.mi.logic;
+
+import era.mi.logic.timeline.Timeline;
+
+public class Simulation
+{
+       public final static Timeline TIMELINE = new Timeline(11);
+
 }
\ No newline at end of file