From 30da5953597d43dfb9a5fce56615ce3682a522ef Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 20 May 2015 10:52:08 +0200
Subject: merge fix

---
 app/src/main/java/org/rssin/neurons/NeuralNetwork.java | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/src/main')

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;
-- 
cgit v1.2.3