fix:wrong-01

src/app/pages/admin/system-settings/system-settings.ts

@@ -1,10 +1,6 @@
 import { Component, OnInit, AfterViewInit, ViewChild, ElementRef } from '@angular/core';
-<<<<<<< HEAD
 import * as echarts from 'echarts';
-import { CommonModule } from '@angular/common';
-=======
 import { CommonModule, NgIf, NgForOf } from '@angular/common';
->>>>>>> bad0e181d3082e479a9e3e3e6feaccaa13118175
 import { RouterModule } from '@angular/router';
 import { FormsModule } from '@angular/forms';
 import { SettingDialogComponent } from './setting-dialog/setting-dialog'; // @ts-ignore: Component used in code but not in template