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.

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

Jump to bottom

Fix conflict #514

Merged
merged 26 commits into from
Oct 30, 2023
Merged

Fix conflict #514

merged 26 commits into from
Oct 30, 2023

Conversation

joyguptaa
Copy link
Contributor

No description provided.

ankushdharkar and others added 26 commits December 9, 2022 16:32
@ankushdharkar
Merge pull request Real-Dev-Squad#336 from Real-Dev-Squad/develop
13ccc7f 
Dev to Main Sync
@rohan09-raj @heyrandhir
handles the case when user status not found in collection (Real-Dev-S…
a365dcc 
…quad#337) (Real-Dev-Squad#338)

* handles the case when user status not found in collection

* Resolves Rohan Raj comments on Real-Dev-Squad#337

Co-authored-by: Randhir Kumar Singh <[email protected]>
@rohan09-raj
Merge pull request Real-Dev-Squad#339 from Real-Dev-Squad/develop
bc6a58a 
Sync dev to main
@rohan09-raj
Merge pull request Real-Dev-Squad#346 from Real-Dev-Squad/develop
05a121c 
Sync dev to main
@rohan09-raj
Merge pull request Real-Dev-Squad#357 from Real-Dev-Squad/develop
ebe6f50 
Sync dev to main
@ankushdharkar
Merge pull request Real-Dev-Squad#370 from Real-Dev-Squad/develop
4dd072a 
Sync dev to main
@prakashchoudhary07
Fix: add toast service, in signup route (Real-Dev-Squad#371) (Real-De…
ccfc0a8 
…v-Squad#372)
@prakashchoudhary07
Merge pull request Real-Dev-Squad#374 from Real-Dev-Squad/develop
269d8e2 
dev to main sync
@rohan09-raj
Merge pull request Real-Dev-Squad#395 from Real-Dev-Squad/develop
11e9035 
Sync main with develop
@rohan09-raj
Merge pull request Real-Dev-Squad#401 from Real-Dev-Squad/develop
8ec2444 
Sync dev to main
@RitikJaiswal75
Merge pull request Real-Dev-Squad#404 from Real-Dev-Squad/develop
e0ea26d 
dev to main sync
@iamitprakash
Merge pull request Real-Dev-Squad#411 from Real-Dev-Squad/develop
cbefd25 
Sync dev to main
@ankushdharkar
Merge pull request Real-Dev-Squad#431 from Real-Dev-Squad/develop
613d26a 
Dev to Main Sync
@ankushdharkar
Merge pull request Real-Dev-Squad#438 from Real-Dev-Squad/develop
065c232 
Dev to Main sync
@rohan09-raj
Merge pull request Real-Dev-Squad#448 from Real-Dev-Squad/develop
17c4bda 
Dev to Main Sync
@Ajeyakrishna-k
Dev to main sync (Real-Dev-Squad#459)
8f52558 
* fix : task status fails to update to VERIFIED

* fix : task status fails to update to VERIFIED
@ankushdharkar
Merge pull request Real-Dev-Squad#463 from Real-Dev-Squad/develop
e500558 
Dev to main Sync
@ankushdharkar
Merge pull request Real-Dev-Squad#469 from Real-Dev-Squad/develop
41cdff3 
dev to main sync
@iamitprakash
Merge pull request Real-Dev-Squad#475 from Real-Dev-Squad/develop
bc08d23 
Refactored in QR code signIn feature
@iamitprakash
Merge pull request Real-Dev-Squad#483 from Real-Dev-Squad/develop
d325ad9
@iamitprakash
Merge pull request Real-Dev-Squad#490 from Real-Dev-Squad/develop
aff1f5c
@rohan09-raj
Merge pull request Real-Dev-Squad#493 from Real-Dev-Squad/develop
17db265 
Dev to Main Sync
@iamitprakash
Merge pull request Real-Dev-Squad#494 from Real-Dev-Squad/develop
17fad6e
@iamitprakash
Merge pull request Real-Dev-Squad#502 from Real-Dev-Squad/develop
ccd6302 
dev to main sync
@prakashchoudhary07
Dev to Main sync (Real-Dev-Squad#504)
046c2d1
@joyguptaa
Merge branch 'main' into fix-conflict
4ae9024
@netlify
Copy link

netlify bot commented Oct 30, 2023 •
edited
Loading

✅ Deploy Preview for staging-my ready!

Name Link
🔨 Latest commit 4ae9024
🔍 Latest deploy log https://app.netlify.com/sites/staging-my/deploys/653f06c4f39cf7000809bc8d
😎 Deploy Preview https://deploy-preview-514--staging-my.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@lakshayman lakshayman merged commit 83f4a06 into Real-Dev-Squad:develop Oct 30, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lakshayman lakshayman lakshayman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@joyguptaa @lakshayman @ankushdharkar @rohan09-raj @prakashchoudhary07 @RitikJaiswal75 @iamitprakash @Ajeyakrishna-k