diff --git a/sample_projects_intracellular/boolean/tutorial/scripts/Cell_cycle_boolean_analysis.ipynb b/sample_projects_intracellular/boolean/tutorial/scripts/Cell_cycle_boolean_analysis.ipynb index 42868e978..0299b8903 100644 --- a/sample_projects_intracellular/boolean/tutorial/scripts/Cell_cycle_boolean_analysis.ipynb +++ b/sample_projects_intracellular/boolean/tutorial/scripts/Cell_cycle_boolean_analysis.ipynb @@ -18,11 +18,15 @@ "metadata": { "execution": { <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 48c7af43 (Updated notebooks, preprint. Added references in the readme) "iopub.execute_input": "2024-06-07T17:38:06.823340Z", "iopub.status.busy": "2024-06-07T17:38:06.822862Z", "iopub.status.idle": "2024-06-07T17:38:09.484519Z", "shell.execute_reply": "2024-06-07T17:38:09.484026Z", "shell.execute_reply.started": "2024-06-07T17:38:06.823276Z" +<<<<<<< HEAD ======= "iopub.execute_input": "2024-05-28T12:47:23.695499Z", "iopub.status.busy": "2024-05-28T12:47:23.695097Z", @@ -30,17 +34,23 @@ "shell.execute_reply": "2024-05-28T12:47:26.384367Z", "shell.execute_reply.started": "2024-05-28T12:47:23.695452Z" >>>>>>> a586442c (Added cycle analysis for sizek mutants) +======= +>>>>>>> 48c7af43 (Updated notebooks, preprint. Added references in the readme) } }, "outputs": [ { "data": { "text/html": [ +<<<<<<< HEAD <<<<<<< HEAD "" ], "text/plain": [ @@ -383,6 +397,7 @@ { "data": { "text/html": [ +<<<<<<< HEAD <<<<<<< HEAD "