Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

questions category changes by sanjevv

Browse Source
This commit is contained in:
gandhimathi 2018-10-15 21:45:49 +05:30
parent d1ca2a0ed6
commit 1a645dd5a1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
View File

@ -35,15 +35,9 @@
<mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell> <mat-cell *matCellDef="let row; let i = index;"> {{row.serialno}} </mat-cell>
</ng-container> </ng-container>
<<<<<<< HEAD
<ng-container matColumnDef="category_name"> <ng-container matColumnDef="category_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Question Category Name </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
=======
<ng-container matColumnDef="categroy_name">
<mat-header-cell *matHeaderCellDef mat-sort-header> Category </mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header> Category </mat-header-cell>
<mat-cell *matCellDef="let row"> {{row.categroy_name}} </mat-cell> <mat-cell *matCellDef="let row"> {{row.category_name}} </mat-cell>
>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff
</ng-container> </ng-container>
<ng-container matColumnDef="isactive"> <ng-container matColumnDef="isactive">