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

Add new field PastJob #62

Merged
merged 21 commits into from
Mar 5, 2019
Merged

Conversation

CaesarTY
Copy link

@CaesarTY CaesarTY commented Mar 4, 2019

No description provided.

Fix all Conflicts

# Conflicts:
#	src/main/java/seedu/address/logic/commands/EditCommand.java
#	src/main/java/seedu/address/logic/parser/AddCommandParser.java
#	src/main/java/seedu/address/logic/parser/EditCommandParser.java
#	src/main/java/seedu/address/model/person/Person.java
#	src/main/java/seedu/address/model/util/SampleDataUtil.java
#	src/main/java/seedu/address/storage/JsonAdaptedPerson.java
#	src/main/java/seedu/address/ui/PersonCard.java
#	src/main/resources/view/PersonListCard.fxml
#	src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
#	src/test/java/guitests/guihandles/PersonCardHandle.java
#	src/test/java/seedu/address/logic/commands/CommandTestUtil.java
#	src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
#	src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java
#	src/test/java/seedu/address/testutil/PersonBuilder.java
#	src/test/java/seedu/address/testutil/PersonUtil.java
#	src/test/java/seedu/address/testutil/TypicalPersons.java
#	src/test/java/seedu/address/ui/PersonListPanelTest.java
#	src/test/java/seedu/address/ui/testutil/GuiTestAssert.java
@WeeSooJun WeeSooJun merged commit 42e33ce into CS2103-AY1819S2-W15-3:master Mar 5, 2019
@DanielDSSim DanielDSSim added this to the v1.1 milestone Mar 6, 2019
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

3 participants