update documentations

src/omlt/neuralnet/activations/__init__.py

@@ -1,22 +1,10 @@
-<<<<<<< HEAD
-from omlt.neuralnet.activations.linear import (
-    linear_activation_constraint,
-    linear_activation_function,
-)
-from omlt.neuralnet.activations.relu import (
-    ComplementarityReLUActivation,
-    bigm_relu_activation_constraint,
-)
-from omlt.neuralnet.activations.smooth import (
-=======
 r"""
 Since all activation functions are element-wised, we only consider how to formulate activation functions for a single neuron, where :math:`x` denotes pre-activation variable, and :math:`y` denotes post-activation variable.
 
 """
 from .linear import linear_activation_constraint, linear_activation_function
 from .relu import ComplementarityReLUActivation, bigm_relu_activation_constraint
 from .smooth import (
->>>>>>> a3d128d569b9b7cbf13315ea6be813f076d56b22
     sigmoid_activation_constraint,
     sigmoid_activation_function,
     softplus_activation_constraint,

src/omlt/neuralnet/layers/__init__.py

@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-from omlt.neuralnet.layers.full_space import (
-    full_space_conv2d_layer,
-    full_space_dense_layer,
-    full_space_gnn_layer,
-)
-from omlt.neuralnet.layers.reduced_space import reduced_space_dense_layer
-=======
 r"""
 Since OMLT builds layer and activation functions in layer level, we ignore the layer index and use the following notations to describe the :math:`l`-th layer:
 
@@ -23,4 +15,3 @@
 """
 from .full_space import full_space_conv2d_layer, full_space_dense_layer
 from .reduced_space import reduced_space_dense_layer
->>>>>>> a3d128d569b9b7cbf13315ea6be813f076d56b22