From 4af3d2a2f5733a61235ba6b649f263c715721ba2 Mon Sep 17 00:00:00 2001
From: charnaexw <charnaexw@gmail.com>
Date: Sun, 27 Jun 2021 19:20:59 -0400
Subject: [PATCH] .log maybe

---
 .../scientificcalculator/Calculator.java      |  2 +-
 .../scientificcalculator/Scientific.java      | 26 +++++--------------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java
index 5219610..9b49493 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java
@@ -15,5 +15,5 @@ public int subtract(int firstNum, int secondNum) {
         return result;
     }
 
->>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b
+//>>>>>>> 67032e40a3e1b20aaf10917261cc55a57dbfe45b
 }
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java
index 5f37269..766b36b 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/Scientific.java
@@ -52,32 +52,18 @@ public static void main(String[] args) {
             case "!x":
                 long fact = 1;
                 for (int i = 2; i <= firstNum; i++) {
-                    answer = fact * i;
-                }
+                    answer = fact * i;}
                 break;
-
             default:
                 System.out.println("ERR");
         }
-        public Integer
-    }
+        public Integer {
+
+            switch {
+
 
-    public void actionPerformed(ActionEvent e) {
-        String s = e.getActionCommand();
-        switch (operator) {
-            case "MC":
-                m1 = 0;
-                tfield.setText("");
-                break;
-            case "MR" :
-                tfield.setText("");
-                tfield.setText(tfield.getText() + m1);
-                break;
-            case "M-" :
-                //something I have no clue
-                break;
 
                     }
-                }
+        }
 
 }
\ No newline at end of file