From dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Wed, 2 Mar 2022 23:38:27 +0100
Subject: Merge branch 'dev' of
 http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore
---
 .../TestAppOgnjen/FrontEnd/src/app/app.module.ts   | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts

(limited to 'sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts')

diff --git a/sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts b/sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts
new file mode 100644
index 00000000..80bf0308
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/src/app/app.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { ListaComponent } from './lista/lista.component';
+import { SharedService } from './shared.service';
+
+
+import {HttpClientModule} from '@angular/common/http';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    ListaComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+    HttpClientModule,
+    FormsModule,
+    ReactiveFormsModule
+  ],
+  providers: [SharedService],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
-- 
cgit v1.2.3