Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-workflow
Commits
c4c546bb
Commit
c4c546bb
authored
2 years ago
by
Shruti3004
Browse files
Options
Download
Plain Diff
fix: merge conflicts
Signed-off-by:
Shruti3004
<
mail2shruti.ag@gmail.com
>
parents
8af04d45
c25b3452
main
dev
feat/centro
feature/formlistapi
fix/remove-forms
revert-67-contributeByGitpod
No related merge requests found
Changes
578
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
apps/wrapper/src/App.js
+1
-1
apps/wrapper/src/App.js
packages/enketo-express/config/default-config.json
+1
-1
packages/enketo-express/config/default-config.json
packages/form-manager/src/app.service.ts
+9
-2
packages/form-manager/src/app.service.ts
packages/form-manager/src/forms/anm_1st_year_albumin_test.xml
+9
-0
...ages/form-manager/src/forms/anm_1st_year_albumin_test.xml
packages/form-manager/src/forms/anm_1st_year_applying_a_bandage.xml
+22
-0
...orm-manager/src/forms/anm_1st_year_applying_a_bandage.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_both_groin.xml
+1
-0
...manager/src/forms/anm_1st_year_bandage_for_both_groin.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_chin.xml
+1
-0
.../form-manager/src/forms/anm_1st_year_bandage_for_chin.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_cover_knee.xml
+1
-0
...manager/src/forms/anm_1st_year_bandage_for_cover_knee.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_elbow.xml
+1
-0
...form-manager/src/forms/anm_1st_year_bandage_for_elbow.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_finger.xml
+1
-0
...orm-manager/src/forms/anm_1st_year_bandage_for_finger.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_foot_ankle.xml
+1
-0
...manager/src/forms/anm_1st_year_bandage_for_foot_ankle.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_forearm.xml
+1
-0
...rm-manager/src/forms/anm_1st_year_bandage_for_forearm.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_groin.xml
+1
-0
...form-manager/src/forms/anm_1st_year_bandage_for_groin.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_lower_leg.xml
+1
-0
...-manager/src/forms/anm_1st_year_bandage_for_lower_leg.xml
packages/form-manager/src/forms/anm_1st_year_bandage_for_upper_arm.xml
+1
-0
...-manager/src/forms/anm_1st_year_bandage_for_upper_arm.xml
packages/form-manager/src/forms/anm_1st_year_bandage_of_upper_limb_hand_wrist.xml
+1
-0
...c/forms/anm_1st_year_bandage_of_upper_limb_hand_wrist.xml
packages/form-manager/src/forms/anm_1st_year_blanket_bed_xlsx.xml
+14
-0
.../form-manager/src/forms/anm_1st_year_blanket_bed_xlsx.xml
packages/form-manager/src/forms/anm_1st_year_blood_blood_component_therapy_xlsx.xml
+4
-0
...forms/anm_1st_year_blood_blood_component_therapy_xlsx.xml
packages/form-manager/src/forms/anm_1st_year_bowel_wash_xlsx.xml
+1
-0
...s/form-manager/src/forms/anm_1st_year_bowel_wash_xlsx.xml
packages/form-manager/src/forms/anm_1st_year_cap_line_bandage.xml
+1
-0
.../form-manager/src/forms/anm_1st_year_cap_line_bandage.xml
with
73 additions
and
4 deletions
+73
-4
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
Shruti3004 <mail2shruti.ag@gmail.com>Shruti3004 <mail2shruti.ag@gmail.com>