Merge conflict
Showing
- ChatService/nbproject/project.properties 4 additions, 0 deletionsChatService/nbproject/project.properties
- IdentService/build/web/WEB-INF/classes/org/IdentService/DBAccount.class 0 additions, 0 deletions...uild/web/WEB-INF/classes/org/IdentService/DBAccount.class
- IdentService/build/web/WEB-INF/classes/org/IdentService/RandomString.class 0 additions, 0 deletions...d/web/WEB-INF/classes/org/IdentService/RandomString.class
- IdentService/build/web/WEB-INF/classes/org/IdentService/RetrieveAccount.class 0 additions, 0 deletions...eb/WEB-INF/classes/org/IdentService/RetrieveAccount.class
- IdentService/build/web/WEB-INF/classes/org/IdentService/register.class 0 additions, 0 deletions...build/web/WEB-INF/classes/org/IdentService/register.class
- IdentService/build/web/WEB-INF/classes/org/IdentService/tesKoneksi.class 0 additions, 0 deletions...ild/web/WEB-INF/classes/org/IdentService/tesKoneksi.class
- IdentService/build/web/WEB-INF/classes/org/IdentService/validate.class 0 additions, 0 deletions...build/web/WEB-INF/classes/org/IdentService/validate.class
- IdentService/dist/IdentService.war 0 additions, 0 deletionsIdentService/dist/IdentService.war
- IdentService/nbproject/private/private.xml 1 addition, 5 deletionsIdentService/nbproject/private/private.xml
- IdentService/nbproject/project.properties 4 additions, 0 deletionsIdentService/nbproject/project.properties
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProduct.java 15 additions, 15 deletions...ws/org/kaa/marketplaceservice/service/AddEditProduct.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/AddEditProductResponse.java 9 additions, 9 deletions...aa/marketplaceservice/service/AddEditProductResponse.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/Buy.java 15 additions, 15 deletions...ources/jax-ws/org/kaa/marketplaceservice/service/Buy.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/BuyResponse.java 9 additions, 9 deletions...ax-ws/org/kaa/marketplaceservice/service/BuyResponse.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProduct.java 10 additions, 10 deletions...-ws/org/kaa/marketplaceservice/service/DeleteProduct.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/DeleteProductResponse.java 9 additions, 9 deletions...kaa/marketplaceservice/service/DeleteProductResponse.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java 9 additions, 9 deletions...s/jax-ws/org/kaa/marketplaceservice/service/GetLikes.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetLikesResponse.java 9 additions, 9 deletions.../org/kaa/marketplaceservice/service/GetLikesResponse.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProduct.java 10 additions, 10 deletions...jax-ws/org/kaa/marketplaceservice/service/GetProduct.java
- KAA-JSP/build/generated-sources/jax-ws/org/kaa/marketplaceservice/service/GetProductResponse.java 9 additions, 9 deletions...rg/kaa/marketplaceservice/service/GetProductResponse.java
Please register or sign in to comment