merge conflict (f35d0ead) · Commits · KAA / TugasBesar3_AngularJSandFirebase · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

TugasBesar3_AngularJSandFirebase
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KAA
TugasBesar3_AngularJSandFirebase
Commits
f35d0ead

Commit f35d0ead authored 8 years ago by

kharisisriyant

Downloads
- Plain Diff

merge conflict

parents a0e13e78 267a82ca

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

ChatService/nbproject/ant-deploy.xml 1 addition, 40 deletions

ChatService/nbproject/ant-deploy.xml
ChatService/nbproject/project.properties 4 additions, 0 deletions

ChatService/nbproject/project.properties
ChatService/src/java/org/ChatService/DeleteToken.java 110 additions, 0 deletions

ChatService/src/java/org/ChatService/DeleteToken.java
IdentService/nbproject/ant-deploy.xml 1 addition, 40 deletions

IdentService/nbproject/ant-deploy.xml
IdentService/nbproject/project.properties 4 additions, 0 deletions

IdentService/nbproject/project.properties
KAA-JSP/nbproject/ant-deploy.xml 1 addition, 40 deletions

KAA-JSP/nbproject/ant-deploy.xml
KAA-JSP/nbproject/project.properties 4 additions, 0 deletions

KAA-JSP/nbproject/project.properties
MarketPlaceService/nbproject/ant-deploy.xml 1 addition, 40 deletions

MarketPlaceService/nbproject/ant-deploy.xml
MarketPlaceService/nbproject/project.properties 4 additions, 0 deletions

MarketPlaceService/nbproject/project.properties

with 130 additions and 160 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment