Remove left over merge conflict

Author: bflammers

README.md

@@ -24,19 +24,6 @@ ANN2 has the following features:
 -   Helper functions for predicting, reconstructing, encoding and decoding
 -   Reading and writing the trained model from / to disk
 -   Access to model parameters and low-level Rcpp module methods
-=======
-* Easy to use interface - defining and training neural nets with a single function call!
-* Activation functions: tanh, sigmoid, relu, linear, ramp, step
-* Loss functions: log, squared, absolute, huber, pseudo-huber
-* Regularization: L1, L2
-* Optimizers: sgd, sgd w/ momentum, RMSprop, ADAM
-* Plotting functions for visualizing encodings, reconstructions and loss (training and validation)
-* Helper functions for predicting, reconstructing, encoding and decoding
-* Reading and writing the trained model from / to disk
-* Access to model parameters and low-level Rcpp module methods
-
-## :hammer_and_wrench: Usage
->>>>>>> 910f3855841191e84ef3252180273e3864dd7f00
 
 ## :hammer_and_wrench: Usage