From a3a11bc16c442f1cc313ae61e84e41f281e78906 Mon Sep 17 00:00:00 2001
From: Jeremy Nelson <jerednel@gmail.com>
Date: Fri, 29 Nov 2019 13:02:13 -0500
Subject: [PATCH] merging

---
 .idea/workspace.xml                  | 49 ++++++++++++++++++----------
 markov_model_attribution/__init__.py |  5 +--
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d280e47..6fb5047 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e8fe240c-744e-4d9d-ab51-6a4bb887e59f" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/markov_model_attribution/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/markov_model_attribution/__init__.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,8 +15,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/markov_model_attribution/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+            <state relative-caret-position="45">
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
               <folding>
                 <element signature="e#0#19#0" expanded="true" />
               </folding>
@@ -47,7 +46,7 @@
         <entry file="file://$PROJECT_DIR$/readme.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="105">
+              <first_editor relative-caret-position="104">
                 <caret line="7" column="184" selection-start-line="7" selection-start-column="184" selection-end-line="7" selection-end-column="184" />
               </first_editor>
               <second_editor />
@@ -102,8 +101,8 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="516" />
-    <option name="y" value="181" />
+    <option name="x" value="135" />
+    <option name="y" value="90" />
     <option name="width" value="1343" />
     <option name="height" value="792" />
   </component>
@@ -120,6 +119,22 @@
               <item name="markov_model_attribution" type="b2602c69:ProjectViewProjectNode" />
               <item name="markov_model_attribution" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="markov_model_attribution" type="b2602c69:ProjectViewProjectNode" />
+              <item name="markov_model_attribution" type="462c0819:PsiDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="markov_model_attribution" type="b2602c69:ProjectViewProjectNode" />
+              <item name="markov_model_attribution" type="462c0819:PsiDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="markov_model_attribution" type="b2602c69:ProjectViewProjectNode" />
+              <item name="markov_model_attribution" type="462c0819:PsiDirectoryNode" />
+              <item name="dist" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="markov_model_attribution" type="b2602c69:ProjectViewProjectNode" />
               <item name="markov_model_attribution" type="462c0819:PsiDirectoryNode" />
@@ -241,7 +256,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="183" y="110" width="1343" height="792" extended-state="0" />
+    <frame x="135" y="90" width="1343" height="792" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.34973097" />
@@ -296,23 +311,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="9" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/readme.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="105">
+          <first_editor relative-caret-position="104">
             <caret line="7" column="184" selection-start-line="7" selection-start-column="184" selection-end-line="7" selection-end-column="184" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="9" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -322,8 +337,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/markov_model_attribution/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="53" column="19" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+        <state relative-caret-position="45">
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
           <folding>
             <element signature="e#0#19#0" expanded="true" />
           </folding>
diff --git a/markov_model_attribution/__init__.py b/markov_model_attribution/__init__.py
index e5c4c20..f1dda41 100644
--- 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 = {}