fix

code/moya-management-portal/src/app/app.component.html

@@ -6,7 +6,6 @@
   </h1>
   <a style="float:right; font-size:20px; margin-top: 20px" href="#">Moya Login</a>
 </div>
-<<<<<<< HEAD
 <div style="width:50%; float:left">
   <h2 style="margin-left: 10px">Tulevat tapahtumat</h2>
   <moya-event-list [organisation]="currentOrganisation" style="margin-top:5em;"></moya-event-list>
@@ -15,7 +14,3 @@
   <h2>Ei omaa organisaatiota?</h2>
   <button (click)="newOrg()">Luo uusi organisaatio</button>
 </div>
-=======
-<moya-event-list></moya-event-list>
-<moya-new-organization></moya-new-organization>
->>>>>>> 4a78b3257e1ab2f6f8dbc3b774802a9865ca5d4f

code/moya-management-portal/src/app/organization/organization.module.ts

@@ -6,14 +6,10 @@ import { EventListComponent } from './event-list/event-list.component';
 import {MatSelectModule} from '@angular/material/select';
 import {OrganizationListService} from './organization-list/organization-list.service';
 import {MatCardModule} from '@angular/material/card';
-<<<<<<< HEAD
-import {MatButtonModule} from '@angular/material';
 import { EventsService } from './event-list/event-service.service';
-=======
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatInputModule } from '@angular/material/input';
 import {MatButtonModule, MatDividerModule} from '@angular/material';
->>>>>>> 4a78b3257e1ab2f6f8dbc3b774802a9865ca5d4f
 
 @NgModule({
   imports: [