fix: remove conflicting code and clean up disabled date input field in tareas component

Front/src/app/modules/Profesor/pages/tareas/tareas.component.html

@@ -29,7 +29,6 @@
                         <mat-option value="MAT">Materia</mat-option>
                     </mat-select>
                 </mat-form-field>
-<<<<<<< Updated upstream
 
                 <!-- Si se elige "Fecha de entrega" o "Fecha de asignación" -->
                 <mat-form-field *ngIf="filtroSeleccionado === 'FE' || filtroSeleccionado === 'FA'" class="input"
@@ -49,15 +48,6 @@
                             {{ materia.nombre }}
                         </mat-option>
                     </mat-select>
-=======
-                <mat-form-field class="input"
-                    style="width: 200px; margin-left: 20px; margin-right: 20px; margin-top: 5px;">
-                    <mat-label>Input disabled</mat-label>
-                    <input matInput [matDatepicker]="dp3" disabled>
-                    <mat-hint>MM/DD/YYYY</mat-hint>
-                    <mat-datepicker-toggle matIconSuffix [for]="dp3"></mat-datepicker-toggle>
-                    <mat-datepicker #dp3 disabled="false"></mat-datepicker>
->>>>>>> Stashed changes
                 </mat-form-field>
                 <button class="button-modal" [style.background-color]="color" (click)="openDialog()">
                     <mat-icon class="icon" [style.color]="textColor">add</mat-icon>