My changes

include/bd_pdo_rest.php

@@ -1,5 +1,9 @@
 <?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;

include/db/postgrest.conf

@@ -2,7 +2,11 @@
 
 # The standard connection URI format, documented at
 # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
+<<<<<<< HEAD
 db-uri       = "postgres://postgres:4ud1t0rf4lt4$$@localhost:5432/paad"
+=======
+db-uri       = "postgres://postgres:4ud1t0rf4lt4$$@localhost:5432/paad_pruebas"
+>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
 
 # The database role to use when no client authentication is provided.
 # Should differ from authenticator
@@ -17,4 +21,8 @@ jwt-secret-is-base64 = false
 server-port = 3000
 
 # the location root is /api 
+<<<<<<< HEAD
 server-host = "*"
+=======
+server-host = "*"
+>>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f