chore: Adjust cherry-pick that failed

unoplatform · May 24, 2024 · 2596663 · 2596663
1 parent 518d9a1
commit 2596663
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -594,13 +594,8 @@
       "defaultValue": "false"
     },
     "dspGenerator": {
-<<<<<<< HEAD
-      "displayName": "Import DSP",
-      "description": "Import a Design System Package (DSP) to override Material colors",
-=======
       "displayName": "Import Uno DSP",
       "description": "Import a Uno DSP theme file to override Material colors",
->>>>>>> 6e83206 (chore: Remove the "Design System Package" term for Uno DSP)
       "type": "parameter",
       "datatype": "bool"
     },