Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch add flashcard #40

Merged

Conversation

gan-jw
Copy link

@gan-jw gan-jw commented Oct 4, 2020

No description provided.

@gan-jw gan-jw added this to the v1.2 milestone Oct 4, 2020
@gan-jw gan-jw self-assigned this Oct 4, 2020
…2/tp into branch-AddFlashcard

Resolve conflicts:
#	src/main/java/seedu/address/logic/commands/AddCommand.java
#	src/test/java/seedu/address/logic/commands/AddCommandIntegrationTest.java
@CalistaIo CalistaIo merged commit c2a2b72 into AY2021S1-CS2103-T14-2:branch-v1.2 Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants