Merged logic into master

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

diff --git a/era.mi/src/era/mi/logic/components/gates/AndGate.java b/era.mi/src/era/mi/logic/components/gates/AndGate.java
index a24acc7..5da680e 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/AndGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/AndGate.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 AndGate extends MultiInputGate\r
-{\r
-       public AndGate(int processTime, WireEnd out, WireEnd... in)\r
-       {\r
-               super(processTime, BitVectorMutator::and, 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 AndGate extends MultiInputGate
+{
+       public AndGate(int processTime, WireEnd out, WireEnd... in)
+       {
+               super(processTime, BitVectorMutator::and, out, in);
+       }
+}