From a38b27ebebf855359da16f103e2931e308f3bdb6 Mon Sep 17 00:00:00 2001
From: GeorgianaElena <georgiana.dolocan@gmail.com>
Date: Wed, 24 Mar 2021 12:13:29 +0200
Subject: [PATCH] Remove integration tests from CircleCI

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 48eafc8..dc7841f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -82,6 +82,7 @@ commands:
 
 
 jobs:
+<<<<<<< HEAD
     integration-test:
         docker:
             - image: docker:18.05.0-ce-git
@@ -145,5 +146,4 @@ workflows:
     version: 2
     all-tests:
         jobs:
-            - integration-test
             - upgrade-test