fix merge

Program-AR · Nov 7, 2023 · a6f7581 · a6f7581
1 parent d9276f3
commit a6f7581
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "pilas-bloques-exercises",
-<<<<<<< HEAD
   "version": "1.4.18",
-=======
-  "version": "1.4.17",
->>>>>>> master
   "description": "Exercises for Pilas Bloques",
   "homepage": "http://pilasbloques.program.ar",
   "author": {