diff --git a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html index 63a6ced..897d8a9 100644 --- a/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html +++ b/src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html @@ -140,28 +140,14 @@
-<<<<<<< HEAD + +
-
- - -
- -
-
- -
-
+
@@ -170,14 +156,15 @@
- - +
+
- +