From 135f9a18b29dd676b5f894b820a692e607f71ab0 Mon Sep 17 00:00:00 2001
From: Gilver <roachy@fyralabs.com>
Date: Tue, 10 Feb 2026 12:08:07 -0600
Subject: [PATCH] fix: json-build.yml (#9785)

Signed-off-by: Gilver <roachy@fyralabs.com>
---
 .github/workflows/json-build.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index e2ae04af2e..516403e039 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -35,17 +35,6 @@ on:
         type: boolean
         default: true
 
-<<<<<<< HEAD
-env:
-  RUSTC_WRAPPER: "/usr/bin/sccache"
-  # SCCACHE_NO_DAEMON: "1"
-  # Disable incremental compilation so sccache works better
-  CARGO_INCREMENTAL: "false"
-  SCCACHE_GHA_ENABLED: "true"
-  SCCACHE_RECACHE: "${{ inputs.bust_cache == 'true' && 'true' || '' }}"
-
-=======
->>>>>>> 05feb6592 (feat: Toggleable sccache (#9773))
 jobs:
   build:
     strategy: