cangig the conflict 1

DiamondLightSource · Jul 3, 2024 · 70d88fe · 70d88fe
1 parent 517f470
commit 70d88fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26,663 deletions.
diff --git a/backstage/packages/backend/package.json b/backstage/packages/backend/package.json
@@ -57,4 +57,4 @@
   "files": [
     "dist"
   ]
-}
+}