Update vcpkg.json.jinja

serious-scaffold · Jan 7, 2025 · 542dccf · 542dccf
1 parent 5ee3169
commit 542dccf
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/template/vcpkg.json.jinja b/template/vcpkg.json.jinja
@@ -40,14 +40,9 @@
 [%- endif %]
     {
       "name": "cmake-modules",
-<<<<<<< before updating
-      "version": "1.6.13"
+      "version": "1.6.14"
     }
 [%- if compiled == true %],
-=======
-      "version": "1.6.14"
-    },
->>>>>>> after updating
     {
       "name": "robotology-cmake-ycm",
       "version": "0.16.3"