Merged

2024-03-06 18:16:15 -06:00
parent 0e123fe70f
commit 4b8ca02a2a
14 changed files with 7 additions and 496 deletions
--- a/include/bd_pdo_rest.php
+++ b/include/bd_pdo_rest.php
@@ -1,9 +1,5 @@
 <?php
-<<<<<<< HEAD
-require_once "/saa_dsk/www/vendor/autoload.php";
-=======
 require_once "/usr/share/nginx/html/paad/vendor/autoload.php";
->>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
 $dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
 $dotenv->load();
 use \SeinopSys\PostgresDb;