Skip to content

Resolved Conflicts #96

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.

Sign up for GitHub

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

Open
wants to merge 16 commits into
base: development
Choose a base branch
from
Open

Resolved Conflicts #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
39a8557
Validation Added
Amishakumari544 Jun 11, 2021
f647685
fix validation issue
Amishakumari544 Jun 11, 2021
6349cc8
fixed conflicts
Amishakumari544 Jun 11, 2021
fffbfd7
added validation
Amishakumari544 Jun 13, 2021
b0f21a3
added validation
Amishakumari544 Jun 14, 2021
8645825
removed unwanted space
Amishakumari544 Jun 14, 2021
45ad74a
Merge branch 'development' into newTemp
Amishakumari544 Jun 16, 2021
3777230
updated
Amishakumari544 Jun 16, 2021
8a5904a
fixed mapping issue
Amishakumari544 Jun 16, 2021
d7da621
commit
Amishakumari544 Jun 16, 2021
00a5daf
changes
Amishakumari544 Jun 17, 2021
091e255
parenthesis error solved
Amishakumari544 Jun 17, 2021
5d26fc8
identation
Amishakumari544 Jun 17, 2021
3c4d238
spaces problem
Amishakumari544 Jun 17, 2021
21204d5
trail
Amishakumari544 Jun 17, 2021
ab1082c
commit
Amishakumari544 Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"react-helmet": "^6.1.0",
"react-images-upload": "^1.2.8",
"react-markdown": "^4.3.1",
"react-material-ui-form-validator": "^2.1.1",
"react-material-ui-form-validator": "^2.1.4",
"react-modal-image": "^2.5.0",
"react-perfect-scrollbar": "^1.5.8",
"react-quill": "^1.3.5",
Expand Down
Loading