merge conflict

commaai · Dec 7, 2024 · 4f41c1b · 4f41c1b
1 parent 744175c
commit 4f41c1b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/examples/openpilot/compile3.py b/examples/openpilot/compile3.py
@@ -5,10 +5,7 @@
 if "NOLOCALS" not in os.environ: os.environ["NOLOCALS"] = "1"
 if "JIT_BATCH_SIZE" not in os.environ: os.environ["JIT_BATCH_SIZE"] = "0"
 
-<<<<<<< Updated upstream
 from tinygrad import fetch, Tensor, TinyJit, Context, GlobalCounters, Device
-=======
-from tinygrad import fetch, Tensor, TinyJit, Context, GlobalCounters
 >>>>>>> Stashed changes
 from tinygrad.helpers import DEBUG, getenv
 from tinygrad.tensor import _from_np_dtype