From a82a46b406f00973bb9bb1695ffbdfb8db47c9a9 Mon Sep 17 00:00:00 2001 From: SilviaEzra <159856417+SilviaEzra@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:45:23 +0200 Subject: [PATCH 1/2] solucion errores --- angular.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index 18ffc7fd..ccae7a1e 100755 --- a/angular.json +++ b/angular.json @@ -22,7 +22,8 @@ }, "index": "src/index.html", "polyfills": [ - "zone.js" + "zone.js", + "@angular/localize/init" ], "tsConfig": "tsconfig.app.json", "inlineStyleLanguage": "scss", @@ -39,8 +40,8 @@ ], "scripts": [ "node_modules/jquery/dist/jquery.min.js", - "node_modules/@popperjs/core/dist/umd/popper.min.js", - "node_modules/bootstrap/dist/css/bootstrap.min.css" + "node_modules/@popperjs/core/dist/umd/popper.min.js" + ], "browser": "src/main.ts", "stylePreprocessorOptions": { From 82be2d04b7ac4c81416014b193c64c6fdf9249db Mon Sep 17 00:00:00 2001 From: SilviaEzra <159856417+SilviaEzra@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:54:50 +0200 Subject: [PATCH 2/2] Merge branch 'develop' of https://github.com/IT-Academy-BCN/ita-challenges-frontend into develop --- angular.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/angular.json b/angular.json index ccae7a1e..4e55e652 100755 --- a/angular.json +++ b/angular.json @@ -40,7 +40,8 @@ ], "scripts": [ "node_modules/jquery/dist/jquery.min.js", - "node_modules/@popperjs/core/dist/umd/popper.min.js" + "node_modules/@popperjs/core/dist/umd/popper.min.js", + "node_modules/bootstrap/dist/js/bootstrap.min.js" ], "browser": "src/main.ts",