merge conflict
Showing
- IdentService/build/web/WEB-INF/classes/org/IdentService/login.class 0 additions, 0 deletions...ce/build/web/WEB-INF/classes/org/IdentService/login.class
- IdentService/build/web/WEB-INF/sun-web.xml 4 additions, 3 deletionsIdentService/build/web/WEB-INF/sun-web.xml
- IdentService/build/web/gfv3ee6.dpf 0 additions, 0 deletionsIdentService/build/web/gfv3ee6.dpf
- IdentService/dist/IdentService.war 0 additions, 0 deletionsIdentService/dist/IdentService.war
- IdentService/nbproject/ant-deploy.xml 1 addition, 40 deletionsIdentService/nbproject/ant-deploy.xml
- IdentService/nbproject/private/private.properties 6 additions, 6 deletionsIdentService/nbproject/private/private.properties
- IdentService/nbproject/private/private.xml 1 addition, 3 deletionsIdentService/nbproject/private/private.xml
- IdentService/nbproject/project.properties 1 addition, 1 deletionIdentService/nbproject/project.properties
- IdentService/src/java/org/IdentService/login.java 32 additions, 3 deletionsIdentService/src/java/org/IdentService/login.java
- IdentityService/build/web/META-INF/MANIFEST.MF 0 additions, 2 deletionsIdentityService/build/web/META-INF/MANIFEST.MF
- IdentityService/build/web/WEB-INF/classes/org/KAA/IdentityService/login.class 0 additions, 0 deletions...d/web/WEB-INF/classes/org/KAA/IdentityService/login.class
- IdentityService/build/web/WEB-INF/classes/org/KAA/IdentityService/register.class 0 additions, 0 deletions...eb/WEB-INF/classes/org/KAA/IdentityService/register.class
- IdentityService/build/web/WEB-INF/classes/org/KAA/IdentityService/validate.class 0 additions, 0 deletions...eb/WEB-INF/classes/org/KAA/IdentityService/validate.class
- IdentityService/build/web/WEB-INF/web.xml 0 additions, 12 deletionsIdentityService/build/web/WEB-INF/web.xml
- IdentityService/build/web/index.html 0 additions, 16 deletionsIdentityService/build/web/index.html
- IdentityService/dist/IdentityService.war 0 additions, 0 deletionsIdentityService/dist/IdentityService.war
- IdentityService/nbproject/private/private.properties 0 additions, 7 deletionsIdentityService/nbproject/private/private.properties
- IdentityService/nbproject/private/private.xml 0 additions, 4 deletionsIdentityService/nbproject/private/private.xml
- 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
Please register or sign in to comment