yahoooooo git add --all!

src/app/app.module.ts

@@ -32,25 +32,15 @@ import { ElasticsearchComponent } from './elasticsearch/elasticsearch.component'
 import { PublishApiComponent } from './publishapi/publishapi.component';
 import { SearchComponent } from './search/search.component'
 import { ParseXmlService } from './services/parse-xml.service';
-<<<<<<< HEAD
 
 import { AuthenticationComponent } from './authentication/authentication.component';
 import { AuthenticationModule } from './authentication/authentication.module';
-=======
-import { NbMenuModule,
-  NbThemeModule,NbStepperModule,
-  NbCardModule, NbSidebarModule, NbLayoutModule,
-  NbButtonModule, NbIconModule, NbInputModule, NbContextMenuModule, NbUserModule, NbSpinnerModule, NbSelectModule, NbTabsetModule, NbTooltipModule  } from '@nebular/theme/';
-import { NbEvaIconsModule } from '@nebular/eva-icons';
-import { AccountComponent } from './account/account.component';
-import { AccountModule } from './account/account.module';
->>>>>>> Added form to describe repository's openapi
 import { SearchModule} from './search/search.module';
 import { StatsComponent } from './stats/stats.component';
 import { NebularModule } from './nebular.module';
 
 import { AppRoutingModule } from './app-routing.module';
-import { NbLayoutModule, NbThemeModule } from '@nebular/theme';
+import { NbLayoutModule, NbThemeModule, NbTooltipModule, NbSpinnerModule, NbSelectModule, NbTabsetModule } from '@nebular/theme';
 import { NbAuthModule } from '@nebular/auth/auth.module';
 import { NbDummyAuthStrategy } from '@nebular/auth/strategies/dummy/dummy-strategy';
 import { DashboardComponent } from './dashboard/dashboard.component';
@@ -89,19 +79,16 @@ import { DashboardComponent } from './dashboard/dashboard.component';
     HttpClientModule,
     FileSaverModule,
     SearchModule,
-<<<<<<< HEAD
     AppRoutingModule,
     AuthenticationModule,
     NebularModule,    
     BrowserAnimationsModule,
     NbThemeModule.forRoot({ name: 'default' }),
-    NbLayoutModule
-=======
+    NbLayoutModule,
     NbSpinnerModule,
     NbSelectModule,
     NbTabsetModule,
     NbTooltipModule
->>>>>>> Added form to describe repository's openapi
   ],
 
   providers: [