fixed merge conflicts with main

lanl-ansi · May 22, 2024 · 608c04a · 608c04a
2 parents 2c4c345 + 3ecb269
commit 608c04a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/notebooks/PhotosynthesisExample.ipynb b/notebooks/PhotosynthesisExample.ipynb
@@ -59,7 +59,6 @@
     "import re\n",
     "import sys\n",
     "import time\n",
-    "import uuid\n",
     "import cirq\n",
     "import numpy as np\n",
     "from dataclasses import dataclass\n",

diff --git a/pyproject.toml b/pyproject.toml
@@ -15,4 +15,4 @@ classifiers = [
 ]
 
 [tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
+dependencies = {file = ["requirements.txt"]}
diff --git a/src/qca/utils/hamiltonian_utils.py b/src/qca/utils/hamiltonian_utils.py
@@ -205,7 +205,6 @@ def assign_hexagon_labels(graph:Graph, x:str='X', y:str='Y', z:str='Z'):
         if r2 - r1 < 0 or c2 - c1 < 0:
             r1, r2 = r2, r1
             c1, c2 = c2, c1
-
         # now that they are ordered correctly, we can assign labels
         label = ''
         if c1 == c2: