From 97118f8e9401f895f585053ded1b40ad3a71ef78 Mon Sep 17 00:00:00 2001
From: SoftFever <103989404+SoftFever@users.noreply.github.com>
Date: Sun, 7 May 2023 11:58:49 +0800
Subject: [PATCH] Fix a regression: Generic filament profiles conflicts #981

---
 .../profiles/Creality/filament/Creality Generic PC.json    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/profiles/Creality/filament/Creality Generic PC.json b/resources/profiles/Creality/filament/Creality Generic PC.json
index 800c1c935c..9b05d18854 100644
--- a/resources/profiles/Creality/filament/Creality Generic PC.json	
+++ b/resources/profiles/Creality/filament/Creality Generic PC.json	
@@ -1,6 +1,13 @@
 {
     "type": "filament",
+<<<<<<<< HEAD:resources/profiles/Creality/filament/Creality Generic PC.json
     "name": "Creality Generic PC",
+========
+    "filament_id": "GFC99",
+    "name": "OrcaArena Generic PC @base",
+    "from": "system",
+    "instantiation": "false",
+>>>>>>>> 7f8855b5b (Fix a regression: Generic filament profiles conflicts #981):resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json
     "inherits": "fdm_filament_pc",
     "from": "system",
     "filament_id": "GFC99",