Update __init__.py

autonlab · Apr 7, 2022 · 67d106d · 67d106d
1 parent eb88f79
commit 67d106d
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/auton_survival/models/dcm/__init__.py b/auton_survival/models/dcm/__init__.py
@@ -79,18 +79,9 @@ class DeepCoxMixtures:
   layers: list
       A list of integers consisting of the number of neurons in each
       hidden layer.
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
   random_seed: int
       Controls the reproducibility of called functions.
- 
->>>>>>> Stashed changes
-=======
-  random_seed: int
-      Controls the reproducibility of called functions.
-        
->>>>>>> db17080dcfd91df1c07937d54c479ae6ab1eaf88
+
   Example
   -------
   >>> from auton_survival.models.dcm import DeepCoxMixtures