fix req

PennyLaneAI · May 17, 2024 · 2cb2569 · 2cb2569
1 parent fe8d465
commit 2cb2569
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,8 +1,5 @@
 pip~=22.0
-<<<<<<< HEAD
-=======
-# git+https://github.com/PennyLaneAI/pennylane.git@master
->>>>>>> master
+git+https://github.com/PennyLaneAI/pennylane.git@master
 ninja
 flaky
 pybind11
@@ -24,5 +21,3 @@ pylint
 scipy~=1.12.0
 autoray<0.6.10
 quimb==1.8.1
-
-# git+https://github.com/PennyLaneAI/pennylane.git@master