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

Update User Guide & Developers Guide #164

Merged
merged 89 commits into from Nov 7, 2019

Conversation

mirozo
Copy link
Collaborator

@mirozo mirozo commented Nov 7, 2019

No description provided.

gohruizhi and others added 30 commits October 1, 2019 22:35
* 'master' of https://github.com/AY1920S1-CS2103-F09-1/main:
  Add add, delete, quickstart to user guide (AY1920S1-CS2103-F09-1#33)
  Update UserGuide.adoc (AY1920S1-CS2103-F09-1#32)
  Update site name and github link
  Update About Us page & Contact Us Page
  Update README.adoc
  Update coveralls link in README.adoc
  Update README.adoc
  Update README.adoc
…into Import

# Conflicts:
#	src/main/java/seedu/address/logic/commands/ImportCommand.java
#	src/main/java/seedu/address/logic/parser/ImportCommandParser.java
#	src/main/java/seedu/address/model/util/CsvReader.java
…o UserGuideForv1.3

# Conflicts:
#	src/main/java/seedu/scheduler/logic/commands/ImportCommand.java
…into testing

# Conflicts:
#	src/main/java/seedu/scheduler/logic/commands/ImportCommand.java
#	src/main/java/seedu/scheduler/model/ModelManager.java
#	src/main/java/seedu/scheduler/model/util/CsvReader.java
…into testing

# Conflicts:
#	src/main/java/seedu/scheduler/logic/commands/ExportCommand.java
#	src/main/java/seedu/scheduler/logic/commands/ImportCommand.java
#	src/main/java/seedu/scheduler/logic/parser/ExportCommandParser.java
#	src/main/java/seedu/scheduler/model/FilePath.java
#	src/main/java/seedu/scheduler/model/util/CsvReader.java
#	src/main/java/seedu/scheduler/model/util/CsvWriter.java
@ChrisKheng ChrisKheng merged commit 244a2ae into AY1920S1-CS2103-F09-1:master Nov 7, 2019
@ChrisKheng ChrisKheng added this to the v1.4 milestone Nov 7, 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

4 participants