ogWebconsole/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "og-webconsole",
-  "version": "0.5.0",
+  "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "og-webconsole",
-      "version": "0.5.0",
+      "version": "0.0.0",
       "dependencies": {
         "@angular/animations": "^18.0.0",
         "@angular/cdk": "~18.0.0",

ogWebconsole/src/app/app.module.ts

@@ -116,6 +116,8 @@ import { CreateOperativeSystemComponent } from './components/operative-system/cr
 import { ShowTemplateContentComponent } from './components/ogboot/pxe/show-template-content/show-template-content.component';
 import { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component';
 import { ClientsComponent } from './components/ogboot/pxe/clients/clients.component';
+<<<<<<< Updated upstream
+=======
 import { RepositoriesComponent } from './components/repositories/repositories.component';
 import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component';
 import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component';
@@ -128,6 +130,7 @@ export function HttpLoaderFactory(http: HttpClient) {
   return new TranslateHttpLoader(http, './locale/', '.json');
 }
 
+>>>>>>> Stashed changes
 @NgModule({
   declarations: [
     AppComponent,
@@ -201,10 +204,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     ShowTemplateContentComponent,
     AddClientsToPxeComponent,
     ClientsComponent,
-    RepositoriesComponent,
-    CreateRepositoryComponent,
-    ExecuteCommandComponent,
-    ExecuteCommandOuComponent
   ],
   bootstrap: [AppComponent],
     imports: [BrowserModule,
@@ -233,6 +232,8 @@ export function HttpLoaderFactory(http: HttpClient) {
         MatDatepickerModule,
         MatNativeDateModule,
         MatSliderModule,
+<<<<<<< Updated upstream
+=======
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -241,6 +242,7 @@ export function HttpLoaderFactory(http: HttpClient) {
           }
         }),
         JoyrideModule.forRoot(),
+>>>>>>> Stashed changes
         ToastrModule.forRoot(
             {
                 timeOut: 5000,