1 files changed, 0 insertions, 4 deletions
diff --git a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
index f5ee569..7c2e447 100755
--- a/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
+++ b/app/src/main/java/org/rssin/neurons/NeuralNetwork.java
@@ -25,11 +25,7 @@ class NeuralNetwork {
     public int addInput() {
         int result = 0;
         for (int i = 0; i < hiddenNodes.length; i++) {
-<<<<<<< HEAD
             result = hiddenNodes[i].addWeight();
-=======
-            //result = hiddenNodes[i].AddWeight();
->>>>>>> 7336ef600f6bd472b9aa1d59ad6418ff5c543044
         }
 
         return result;