fix

Fixed merge leftovers
andromedaprotocol · Feb 11, 2025 · fa5ec59 · fa5ec59
1 parent 179bbf0
commit fa5ec59
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -53,14 +53,8 @@ test-integration:
 	@cargo test -p tests --quiet
 	@echo "Integration tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
 
-# Runs integration tests
-e2e-test:
-	@echo "Running integration tests..."
-	@cargo test -p e2e-tests --quiet
-	@echo "Integration tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
-
 # Runs all tests
-test: unit-test test-integration e2e-test
+test: unit-test test-integration
 	@echo "All tests complete! \033[0;32m\xE2\x9C\x94\033[0m"
 
 # Deploys OS to specified blockchain

diff --git a/e2e-tests/Cargo.toml b/e2e-tests/Cargo.toml
@@ -1,9 +1,5 @@
 [package]
-<<<<<<<< HEAD:tests/Cargo.toml
-name = "tests"
-========
 name = "e2e-tests"
->>>>>>>> main:e2e-tests/Cargo.toml
 version = "1.0.0"
 edition = "2021"
 rust-version = "1.75.0"

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -1,9 +1,5 @@
 [package]
-<<<<<<<< HEAD:tests/Cargo.toml
 name = "tests"
-========
-name = "e2e-tests"
->>>>>>>> main:e2e-tests/Cargo.toml
 version = "1.0.0"
 edition = "2021"
 rust-version = "1.75.0"