Gad 2 2025 latest #1463
Merged
Gad 2 2025 latest #1463
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…usionIIIT#1142) Co-authored-by: Kanha Tiwari <[email protected]> Co-authored-by: KANHA TIWARI <[email protected]>
…oking an appointment (FusionIIIT#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <[email protected]>
…IIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py
… indent with multiple items. (FusionIIIT#1174)
Removed local database file pushed by RSPC
Revert "[RSPC] Final Staging"
Updated OS-2 (PHC module) with File Tracking Functionality Enabled
Merging OS-2 (PHC) into latest_staging
[PS-1] Merging to latest_staging
|
@ChaudharyRaman any specific reason for not adding .idea file to gitignore ?, |
|
@Srivatsa19 Can you please pull from the |
I pulled from the latest_staging and resolved the merge conflicts and this is the PR after resolving the conflicts. |
…into gad-2-2025-latest
…into gad-2-2025-latest
Pulled from latest_staging. |
Priyansh61
approved these changes
Apr 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue that this pull request solves
Merge conflicts resolved.
Closes: # (issue number)
Proposed changes
There were merge conflicts and this is the resolved PR
Brief description of what is fixed or changed
Types of changes
Put an
xin the boxes that applyChecklist
Put an
xin the boxes that applyScreenshots
https://drive.google.com/drive/folders/1iQBxUOuhojei7qLjph9K1bhximrseokW?usp=sharing
Please attach the screenshots of the changes made in case of change in user interface
Other information
@varun7singh
@Priyansh61
@prajjwalkapoor
@ChaudharyRaman
Any other information that is important to this pull request