merging

jerednel · Nov 29, 2019 · a3a11bc · a3a11bc
1 parent d0e6b23
commit a3a11bc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 21 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/markov_model_attribution/__init__.py b/markov_model_attribution/__init__.py
@@ -52,10 +52,7 @@ def first_order(paths):
             sublist.append(userpath)
         total_paths += 1
     paths = sublist
-<<<<<<< HEAD
-=======
-
->>>>>>> 329f52a318dfd0d199b4cfc20721163eb66b4735
+
     unique_touch_list = set(x for element in paths for x in element)
     # get total last touch conversion counts
     conv_dict = {}