From 6253625e2a2ed0047ab6aa42aa7776da01bf451b Mon Sep 17 00:00:00 2001
From: SafetyQuincyF <quincy@safetycli.com>
Date: Fri, 18 Oct 2024 09:31:53 -0700
Subject: [PATCH] fix

---
 .devcontainer/devcontainer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e39961bd..20c25d99 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,8 +15,5 @@
     "postCreateCommand": "pip install -r test_requirements.txt && pip install ruff requests pre-commit",
     "remoteUser": "root",
     "workspaceFolder": "/workspaces/safety",
-<<<<<<< HEAD
-=======
     "forwardPorts": [49152]
->>>>>>> cac1ecb (feat/add-devcontainers-support)
 }