Merged

include/db/postgrest.conf

@@ -2,11 +2,7 @@
 
 # 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
@@ -21,8 +17,4 @@ jwt-secret-is-base64 = false
 server-port = 3000
 
 # the location root is /api 
-<<<<<<< HEAD
-server-host = "*"
-=======
-server-host = "*"
->>>>>>> 7688f1aac1824c234bc5f19b154e9ad1f4808d4f
+server-host = "*"