prettier and lint

2022-11-22 12:32:15 -05:00
parent 30190fee69
commit 93b3d5bab5
1 changed files with 0 additions and 8 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -173,17 +173,9 @@ jobs:
                      - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >>
            - restore_cache:
                  keys:
-<<<<<<< HEAD
-                      - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >>
-            - run: git submodule update --init --recursive
-            - run:
-                  command: forge test
-                  working_directory: ~/project/contracts/zero-ex
-=======
                      - repo-{{ .Environment.CIRCLE_SHA1 }}
            # - run: forge install
            - run: forge test -vvv
->>>>>>> 783a83def (add verbosity for failing tests in CI)
    test-publish:
        resource_class: large
        environment: