Merged logic into master

[Mograsim.git] / era.mi / src / era / mi / logic / components / gates / OrGate.java

diff --git a/era.mi/src/era/mi/logic/components/gates/OrGate.java b/era.mi/src/era/mi/logic/components/gates/OrGate.java
index 0a8047c..8c1775f 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/OrGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/OrGate.java
@@ -1,12 +1,12 @@
-package era.mi.logic.components.gates;\r
-\r
-import era.mi.logic.types.BitVector.BitVectorMutator;\r
-import era.mi.logic.wires.Wire.WireEnd;\r
-\r
-public class OrGate extends MultiInputGate\r
-{\r
-       public OrGate(int processTime, WireEnd out, WireEnd... in)\r
-       {\r
-               super(processTime, BitVectorMutator::or, out, in);\r
-       }\r
-}\r
+package era.mi.logic.components.gates;
+
+import era.mi.logic.types.BitVector.BitVectorMutator;
+import era.mi.logic.wires.Wire.WireEnd;
+
+public class OrGate extends MultiInputGate
+{
+       public OrGate(int processTime, WireEnd out, WireEnd... in)
+       {
+               super(processTime, BitVectorMutator::or, out, in);
+       }
+}