Update c_cpp_properties.json

my head hurts. I can squash commits if this is getting out of hand
MR-VENOM · Apr 24, 2024 · 5427adc · 5427adc
1 parent fb6fc32
commit 5427adc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/examples/template/.vscode/c_cpp_properties.json b/examples/template/.vscode/c_cpp_properties.json
@@ -4,11 +4,7 @@
             "name": "RISCV32EC",
             "includePath": [
                 "${workspaceFolder}/**",
-<<<<<<< HEAD
                 "${workspaceFolder}../../ch32v003fun",
-=======
-                "${workspaceFolder}/../../ch32v003fun",
->>>>>>> 4f99049 (fixed paths)
                 "/usr/include/newlib" //why? the configurationProvider ought to find this
             ],
             "defines": [