Seguimos arreglando errores de merge

src/main/java/com/roshka/proyectofinal/DataBase.java

@@ -10,7 +10,7 @@ public class DataBase {
         try{
         try{
             Class.forName("org.postgresql.Driver");
             Class.forName("org.postgresql.Driver");
             con= DriverManager
             con= DriverManager
-                    .getConnection("jdbc:postgresql://localhost:5433/bootcamp_th",
+                    .getConnection("jdbc:postgresql://localhost:5432/bootcamp_th",
                             "postgres", "postgres");
                             "postgres", "postgres");
 
 
             if(con != null){
             if(con != null){

src/main/java/com/roshka/proyectofinal/Postulante/SaveServlet.java

@@ -114,7 +114,6 @@ public class SaveServlet extends HttpServlet {
                 request.getRequestDispatcher("formulario.jsp").include(request, response);
                 request.getRequestDispatcher("formulario.jsp").include(request, response);
             }else{
             }else{
                 if (rechazarDatos){
                 if (rechazarDatos){
-
                     out.print(" <div class=\"alert info\">\n" +
                     out.print(" <div class=\"alert info\">\n" +
                             "  <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n" +
                             "  <span class=\"closebtn\" onclick=\"this.parentElement.style.display='none';\">&times;</span> \n" +
                             "  <strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" +
                             "  <strong>Formulario ya Cargado!</strong> YA EXISTE EL FORMULARIO\n" +

src/main/webapp/formulario.jsp

@@ -97,24 +97,13 @@ pageEncoding="UTF-8"%>
                                                 </li>
                                                 </li>
                                                 <% } %>
                                                 <% } %>
                                         </ul>
                                         </ul>
-
-
-
-
                                         <input class="enviar info error" type="submit">
                                         <input class="enviar info error" type="submit">
                                         <input class="borrar" type="reset" value="Borrar"><br>
                                         <input class="borrar" type="reset" value="Borrar"><br>
                                         <a href="index.html">volver</a>
                                         <a href="index.html">volver</a>
-
                             </form>
                             </form>
-
-
-
                 </article>
                 </article>
-
-
             </main>
             </main>
         </body>
         </body>
-
         </html>
         </html>
         <script>
         <script>
             (function() {
             (function() {