Powerpuff Cats - 13513035 - Vanya Deasy Safrina #21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 4d796eb.
This reverts commit 81d29bb.
Add table comment and update table token
# Conflicts: # .gitignore
# Conflicts: # .gitignore
# Conflicts: # StackExchange Client/build/web/gfv3ee6.dpf # StackExchange VoteComment/nbproject/project.properties # StackExchange VoteComment/nbproject/project.xml # StackExchange VoteCommentService/nbproject/genfiles.properties # StackExchange VoteCommentService/src/java/controller/VoteServlet.java # StackExchange WebService/nbproject/genfiles.properties # StackExchange WebService/nbproject/project.properties # StackExchange WebService/nbproject/project.xml
# Conflicts: # StackExchange Client/build/web/gfv3ee6.dpf # StackExchange VoteComment/nbproject/project.properties # StackExchange VoteComment/nbproject/project.xml # StackExchange VoteCommentService/nbproject/genfiles.properties # StackExchange VoteCommentService/src/java/controller/VoteServlet.java # StackExchange WebService/nbproject/genfiles.properties # StackExchange WebService/nbproject/project.properties # StackExchange WebService/nbproject/project.xml
Conflicts: StackExchange WebService/build/web/WEB-INF/classes/controllers/QuestionWS.class
Plus delete build & dist
Plus add netbeans things
FINALLY
vanydeasy
changed the title
vanydeasy
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.