Actualizacion 10 Metodos Daniel Jhonatan

src/com/vespot/Genesis.java

@@ -1,6 +1,5 @@
 package com.vespot;
 
-<<<<<<< HEAD
 import cl.servipag.genesis.webservices.GenesisServiceService;
 import cl.servipag.genesis.webservices.GenesisServiceDelegate;
 import com.sun.xml.internal.ws.api.message.Packet;
@@ -17,6 +16,12 @@ import com.vespot_RoleListResponse.RoleListResponse;
 import com.vespot_UpdateUserRequest.UpdateUserRequest;
 import com.vespot_UpdateUserResponse.UpdateUserResponse;
 
+import com.vespot_DeleteUserRequest.DeleteUserRequest;
+import com.vespot_UserBlockRequest.UserBlockRequest;
+import com.vespot_UserListRequest.UserListRequest;
+import com.vespot_WorkstationByBranchListRequest.WorkstationByBranchListRequest;
+import com.vespot_WorkstationMoveRequest.WorkstationMoveRequest;
+
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -175,20 +180,8 @@ public class Genesis {
             Logger.getLogger(Genesis.class.getName()).log(Level.SEVERE, null, ex);
         }
         return null;
-=======
-import com.vespot_DeleteUserRequest.DeleteUserRequest;
-import com.vespot_UserBlockRequest.UserBlockRequest;
-import com.vespot_UserListRequest.UserListRequest;
-import com.vespot_WorkstationByBranchListRequest.WorkstationByBranchListRequest;
-import com.vespot_WorkstationMoveRequest.WorkstationMoveRequest;
 
-/**
- *
- * @author aleja
- */
-public class Genesis {
-
-   
+    }
    
     public String WorkstationMoveRequest(String sessionLoginId, String instance, String bankId, String originatorName, String requestCode,String requestName, String gnsCodigoSucursalOrigen, String gnsCodigoSucursalDestino, String gnsNumeroEstacion) 
     {
@@ -290,12 +283,12 @@ public class Genesis {
         banqS.setGnsBloqueado(gnsBloqueado);
         userB.setBankSvcRq(banqS);
     return null;
->>>>>>> bcc5cc7a32fb775362b37b73c65ea7796c970bfe
+
     }
 
 //4.    
     
-<<<<<<< HEAD
+
     public String RoleList(Integer StatusDesc, Long IdRole, String NombredelRol, String Instance, String BankId, String OriginatorName, String RequestCode, String RequestName) {
         // New Object = RoleListRequest
         RoleListRequest RoleList = new RoleListRequest();
@@ -373,7 +366,6 @@ public class Genesis {
 
     }
 
-=======
     public String DeleteUserRequest(String sessionLoginId, String instance, String bankId, String originatorName, String requestCode, String requestName, String gnsIDUsuario)
     {
         DeleteUserRequest deleteU = new DeleteUserRequest();
@@ -393,5 +385,5 @@ public class Genesis {
         deleteU.setBaseSvcRq(baseS);
     return null;
     }
->>>>>>> bcc5cc7a32fb775362b37b73c65ea7796c970bfe
+
 }