resolving conflicts

Author: Jimmy-INL

examples/basis_comparison-Copy1.ipynb

@@ -6,7 +6,11 @@
 
 class Custom(InvertibleBasis, MatrixMixin):
     """
+<<<<<<< HEAD
     Use a custom transformation to maps input features to
+=======
+    Generate a custom transformation which maps input features to
+>>>>>>> 1ccd23fafed0ca39dac6cde204efa228d133df1c
     custom modes.
 
     Assumes the data has already been centered (to have mean 0).