resolve conflicts
0dd9afa8
Svetloslav Novoselski
committed
10 changed files
settings.json
/.vscode/settings.json+1
/.vscode/settings.json
Add comment 1 Plus  {}
context-menu.component.scss
/projects/igniteui-angular-extras/src/lib/context-menu/context-menu.component.scss-1+1
/projects/igniteui-angular-extras/src/lib/context-menu/context-menu.component.scss
Add comment 6 );
Add comment 7
Add comment 8 .analytics-btn {
Add comment 9 Minus   @include button(button-theme($palette: $fluent-excel-palette,
Add comment 9 Plus   @include button(button-theme(
Add comment 10 $foreground: #fff,
Add comment 11 $background: #335e3b,
Add comment 12 $hover-background: #459a55,
test.ts
/projects/igniteui-angular-extras/src/test.ts-6
/projects/igniteui-angular-extras/src/test.ts
Add comment 8 platformBrowserDynamicTesting
Add comment 9 } from '@angular/platform-browser-dynamic/testing';
Add comment 10
Add comment 11 Minus  declare const require: any;
Add comment 12 Minus  
Add comment 13 11 // First, initialize the Angular testing environment.
Add comment 14 12 getTestBed().initTestEnvironment(
Add comment 15 13 BrowserDynamicTestingModule,
Add comment 17 15 teardown: { destroyAfterEach: false }
Add comment 18 16 }
Add comment 19 17 );
Add comment 20 Minus  // Then we find all the tests.
Add comment 21 Minus  const context = require.context('./', true, /\.spec\.ts$/);
Add comment 22 Minus  // And load the modules.
Add comment 23 Minus  context.keys().map(context);
Add comment 24 18
page-header.component.html
/src/app/page-header/page-header.component.html-1+1
/src/app/page-header/page-header.component.html
Add comment 1 <div class="sample-header">
Add comment 2 Minus   <h1 class="title igx-typography__h3">
Add comment 2 Plus   <h1 class="title ig-typography__h3">
Add comment 3 <button igxButton="icon"
Add comment 4 igxRipple
Add comment 5 igxRippleCentered="true"
app-routing.module.ts
/src/app/app-routing.module.ts-1+1
/src/app/app-routing.module.ts
Add comment 5 const routes: Routes = [];
Add comment 6
Add comment 7 @NgModule({
Add comment 8 Minus   imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
Add comment 8 Plus   imports: [RouterModule.forRoot(routes, {})],
Add comment 9 exports: [RouterModule]
Add comment 10 })
Add comment 11 export class AppRoutingModule { }
app.routing.ts
/src/app/app.routing.ts-1+1
/src/app/app.routing.ts
Add comment 12 component: GridDataAnalysisComponent
Add comment 13 }];
Add comment 14
Add comment 15 Minus  export const ROUTING = RouterModule.forRoot(appRoutes, { relativeLinkResolution: 'legacy' });
Add comment 15 Plus  export const ROUTING = RouterModule.forRoot(appRoutes, {});
Add comment 16
test.ts
/src/test.ts
/src/test.ts
angular.json
/angular.json
/angular.json
package-lock.json
/package-lock.json
/package-lock.json
tsconfig.json
/tsconfig.json
/tsconfig.json