update

projects/textbook/src/app/textbook/textbook.component.html

@@ -146,11 +146,7 @@
           }
         </td>
         <td nzEllipsis>
-<<<<<<< HEAD
           {{ data?.get("majorPoniter")?.code + '/'+data?.get("majorPoniter")?.name || "-" }}
-=======
-          {{ data?.get("majorPoniter")?.name || "-" }}
->>>>>>> 97e6109cf35ed44c937fef2cd84cfbaeeb5c8810
         </td>
         <td nzEllipsis>
           @for (vul of data?.get('childrens'); track vul) {