Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@solomonng2001
solomonng2001 committed Mar 27, 2024
1 parent 4e35925 commit c88c9e3
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions docs/UserGuide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,20 +346,15 @@ All other fields (with the exception of tags) cannot have duplicate parameters.

Fields usage for client details:

| Field | Usage | Example |
|------------------|------------------------------------------------------------------------------------|---------------------------------|
| 'n/NAME' | All names in the system must be unique | `n/John Doe` |
| 'c/PHONE_NUMBER' | Phone numbers should only contain numbers, and it should be at least 3 digits long | `c/98765432` |
| 'e/EMAIL' | Email should be in the format of `local-part@domain` | `e/johndoe@email.com` |
| 'a/ADDRESS' | Address can take any text value | `a/311, Clementi Ave 2, #02-25` |
<<<<<<< HEAD
| 'b/BIRTHDAY' | Birthday should be in the format of `YYYY-MM-DD` | `b/1990-01-01` |
| 'p/PRIORITY' | Priority can be `low`, `medium`, `high` or `vip` | `p/medium`, `p/h` |
=======
| 'd/BIRTHDAY' | Birthday should be in the format of `YYYY-MM-DD` | `d/1990-01-01` |
| 'p/PRIORITY' | Priority can be `low`, `medium`, `high` or `vip` | `p/medium`, `p/h` |
>>>>>>> master
| 't/TAG' | Tags can be any text value | `t/friends` |
| Field | Usage | Example |
|------------------|------------------------------------------------------------------------------------|----------------------------------|
| 'n/NAME' | All names in the system must be unique | `n/John Doe` |
| 'c/PHONE_NUMBER' | Phone numbers should only contain numbers, and it should be at least 3 digits long | `c/98765432` |
| 'e/EMAIL' | Email should be in the format of `local-part@domain` | `e/johndoe@email.com` |
| 'a/ADDRESS' | Address can take any text value | `a/311, Clementi Ave 2, #02-25` |
| 'd/BIRTHDAY' | Birthday should be in the format of `YYYY-MM-DD` | `d/1990-01-01` |
| 'p/PRIORITY' | Priority can be `low`, `medium`, `high`, `vip`, or `l`, `m`, `h`, `v` | `p/medium`, `p/h` |
| 't/TAG' | Tags can be any text value | `t/friends` |

Examples:
* `add n/John Doe c/98765432 e/johnd@example.com a/311, Clementi Ave 2, #02-25 d/1990-01-01 p/low t/friends t/owesMoney`
Expand Down

0 comments on commit c88c9e3

Please sign in to comment.