Typos

casact · Nov 7, 2023 · 976acaa · 976acaa
1 parent a01b770
commit 976acaa
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/docs/getting_started/online_sandbox/sandbox_workbook_blank.ipynb b/docs/getting_started/online_sandbox/sandbox_workbook_blank.ipynb
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "cells": [
         {
@@ -845,6 +846,8 @@
     "nbformat_minor": 5
 }
 =======
+=======
+>>>>>>> 703cc7a (Typos)
  "cells": [
   {
    "cell_type": "markdown",
@@ -1689,4 +1692,7 @@
  "nbformat": 4,
  "nbformat_minor": 5
 }
+<<<<<<< HEAD
 >>>>>>> 1cdf87f (Merged from main)
+=======
+>>>>>>> 703cc7a (Typos)