Solucion error merge

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

@@ -36,45 +36,6 @@ public class PostulanteDao extends HttpServlet {
 
         return status;
     }
-    public static List<Postulante> ListarPostulantes(){
-        List<Postulante> list=new ArrayList<Postulante>();
-
-
-        try{
-
-            Connection con= DataBase.getConnection();
-            PreparedStatement ps=con.prepareStatement("select * from postulante");
-            ResultSet rs=ps.executeQuery();
-            while(rs.next()){
-                Postulante e=new Postulante();
-
-                e.setId(rs.getInt("id"));
-                e.setNombre(rs.getString("nombre"));
-                //e.setPassword(rs.getString(3));
-                e.setCorreo(rs.getString("correo"));
-                e.setApellido(rs.getString("apellido"));
-                e.setDireccion(rs.getString("direccion"));
-                list.add(e);
-            }
-            con.close();
-        }catch(Exception e){e.printStackTrace();}
-
-        return list;
-    }
-    public static int update (Postulante e){
-        int status=0;
-        try{
-            Connection con= DataBase.getConnection();
-            PreparedStatement ps=con.prepareStatement(
-                    "update postulante set aceptado=? where id=?");
-            ps.setBoolean(1,e.getAceptado());
-            ps.setInt(2,e.getId());
-            status=ps.executeUpdate();
-            con.close();
-        }catch(Exception ex){ex.printStackTrace();}
-
-        return status;
-    }
 
 
 

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

@@ -116,11 +116,11 @@ public class SaveServlet extends HttpServlet {
                             out.println("<a href=formulario.jsp >Volver al cuestionario</a>");
                         }else {
                             out.println("<p>El correo ingresado ya esta registrado para el bootcamp actual<p>");
-                            //request.getRequestDispatcher("").include(request, response);
+
                         }
                     }else{
                         out.println("Error");
-                        //out.println("<script> window.alert('Falla al enviar la postulacion,Intente de nuevo') </script>");
+
                     }
                 }
 

src/main/webapp/form.css

+/* el header donde va el logo y el menu  */
+html,body{
+    background-image: url(imagenes/descarga.svg);
+
+}
+/* damos los estilos a todo lo que contiene el body  */
+body{
+    background-color: rgba(11, 49, 110, 0.75);
+    font-family:Calibri, Candara, Segoe, Segoe UI, Optima, Arial, sans-serif;
+    color: wheat;
+    font-weight: bold;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 160%;}
+
+}
+/* para el logo */
+img{
+    width: 165px;
+    padding: 10px;
+}
+
+p.enter{
+    text-align: center;
+    font-size: 20px;
+}
+/* para el parrafo */
+p:hover{
+    color: yellow;
+}
+
+/* para el create o sea para el main */
+.create{
+    width: 100%;
+    max-width: 785px;
+    min-width: 320px;
+    border-radius: 15px;
+    background-color: rgba(11, 49, 110, 0.75);
+    padding: 1rem;
+
+}
+/* contenedor */
+/* para el forrmulario */
+.form label{
+   display: block;
+   border: none;
+   align-items:center;
+
+
+}
+
+.form input{
+    display: block;
+    border: none;
+    width: 50%;
+    align-items:center;
+}
+.form input[type="email"],.form input[type="text"],.form input[type="number"]{
+   background-color: transparent;
+    border-radius: 10px;
+    border: 1px solid #000;
+
+}
+.form input:hover{
+    background-color: wheat;
+}
+
+
+
+a{
+    text-decoration: none;
+}
+ul{
+list-style:none;
+font-size:15px;
+}
+
+a{
+text-decoration:none;
+color:black;
+background-color: #21211d;
+border-radius: 10px;
+  color: #FFF;
+  padding: 10px;
+  margin:15px;
+  text-decoration: none;
+  cursor: pointer;
+  background-image: url(imagenes/descarga.svg);
+}
+ .form input[type="reset"] , .form input[type="submit"]{
+        text-decoration:none;
+        background-color: rgba(11, 49, 110, 0.75);
+          background-image: url(imagenes/descarga.svg);
+        border-radius: 5px;;
+        padding: 10px;
+        border-radius: 10px;
+        margin:10px;
+        text-decoration: none;
+        color:#ffff;
+        text-align:left;
+        cursor: pointer;
+        width:80px;
+        text-align:center;
+    }
+/*hola mundo*/
+
+input#ruby,input#python,input#c,input#javascript,input#java{
+width:30px;
+
+}
+input#experiencia_laboral,input#notebook,input#universidad{
+width:500px;
+}
+
+
+/* para el alert  */
+.alert {
+ padding: 10px;
+ background-color: background-color: #2196F3;
+ color: white;
+}
+
+.alert.info {background-color: #2196F3;}
+.alert.error {background-color:  #ff0000;}
+.closebtn {
+  margin-left: 15px;
+  color: white;
+  font-weight: bold;
+  float: right;
+  font-size: 22px;
+  line-height: 20px;
+  cursor: pointer;
+  transition: 0.3s;
+}
+
+.closebtn:hover {
+  color: black;
+}