From feb1a425f55d4feaba0abe2429e5512859eadeea Mon Sep 17 00:00:00 2001
From: open-junius <zhou@opentensor.dev>
Date: Fri, 5 Jul 2024 22:17:36 +0800
Subject: [PATCH] fix justfile

---
 justfile | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/justfile b/justfile
index 6e4e4faa3..3a4318739 100644
--- a/justfile
+++ b/justfile
@@ -25,34 +25,17 @@ benchmarks:
 
 clippy:
   @echo "Running cargo clippy..."
-<<<<<<< HEAD
-  
-  cargo +{{RUSTV}} clippy  --workspace --all-targets -- -D  \
-=======
   cargo +{{RUSTV}}  clippy --workspace --all-targets -- \
->>>>>>> main
                             -D clippy::todo \
                             -D clippy::unimplemented
 
 clippy-fix:
-<<<<<<< HEAD
-  @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
-
-  cargo +{{RUSTV}} clippy --fix --allow-dirty  --workspace --all-targets -- -A \
-
-                                                      -A clippy::todo \
-                                                      -A clippy::unimplemented
-=======
     @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
     cargo +{{RUSTV}} clippy --fix --allow-dirty --allow-staged --workspace --all-targets -- \
         -A clippy::todo \
         -A clippy::unimplemented \
         -A clippy::indexing_slicing
-<<<<<<< HEAD
->>>>>>> main
-=======
 
->>>>>>> main
 fix:
   @echo "Running cargo fix..."
   cargo +{{RUSTV}} fix --workspace
@@ -64,4 +47,4 @@ lint:
   @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
   just clippy-fix
   @echo "Running cargo clippy..."
-  just clippy
\ No newline at end of file
+  just clippy