monmon hace 5 años
padre
commit
02b5a58e3c
Se han modificado 3 ficheros con 2 adiciones y 4 borrados
  1. 0 4
      home.php
  2. 1 0
      suppliers.php
  3. 1 0
      users.php

+ 0 - 4
home.php

@@ -1,7 +1,3 @@
 <?php 
-<<<<<<< HEAD
 	echo "<CENTER><h1>WELCOME TO ADMIN PAGE</h1></CENTER>";
-=======
-	echo '<CENTER>WELCOME TO ADMIN PAGE</CENTER>';
->>>>>>> a05cdaf0169bcc43dd534dbc668c788c3e73a1cd
  ?>

+ 1 - 0
suppliers.php

@@ -1,2 +1,3 @@
+<?php include "header.php" ?>
 <?php include "api/v1/Suppliers/supplierDetails.php" ?>
 <?php include "api/v1/Suppliers/suppliersVw.php" ?>

+ 1 - 0
users.php

@@ -1,2 +1,3 @@
+<?php include "header.php" ?>
 <?php include "api/v1/Users/userVw.php" ?>
 <?php include "api/v1/Users/userDetails.php" ?>