From ca7ab7a0faaae710d5d28c943b33157e6098cb5f Mon Sep 17 00:00:00 2001
From: Jonas Francisco <jonastom478@gmail.com>
Date: Thu, 25 Sep 2025 13:22:03 -0300
Subject: [PATCH] merge: resolvidos conflitos entre feature/settings e develop
 (sidebar e package-lock.json)

---
 et --hard 23fad33 | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 et --hard 23fad33

diff --git a/et --hard 23fad33 b/et --hard 23fad33
new file mode 100644
index 0000000..77b3c98
--- /dev/null
+++ b/et --hard 23fad33	
@@ -0,0 +1,45 @@
+a0d527c (HEAD -> feature/settings) ajuste no package.json da raiz
+23fad33 (origin/feature/settings) feat: implement settings module
+c36a16b (develop) feat: ajustes na seção de laudos, cpf, imagem e assinatura digital
+913fd6a (origin/feature/doctor-laudo, feature/api-medic) Merge pull request 'feat(api): implementação e integração das APIs de médicos' (#12) from feature/api-medicos into develop
+791d31a (origin/feature/api-medicos, feature/api-medicos) feat(api): implementação e integração das APIs de médicos
+e53d7fb (feature/crud-medi-api) Merge pull request 'feature/scheduling' (#11) from feature/scheduling into develop
+7aadcef Fix: folder organization
+c6b18b7 Merge branch 'develop' of https://git.popcode.com.br/RiseUP/riseup-squad20 into feature/scheduling
+945c6ea fix: Calendar and sidebar
+dfb70c6 Merge pull request 'feature/doctor-register' (#10) from feature/doctor-register into develop
+30b5609 feat: adds new fields and cards to the physician registry
+9dfba10 Merge branch 'develop' into feature/scheduling
+f435ade Ajuste no .gitignore
+9c7ce7d Finalizando merge da branch develop com origin/develop
+76feb4b feat:implements CRUD for doctors
+70c67e4 Merge pull request 'change doctors page' (#8) from feature/changes-doctors-painel into develop
+ba64fde add: new doctor page
+a7c9c90 chore: update components config
+a5d89b3 Merge pull request 'feature/image-doctor' (#7) from feature/image-doctor into develop
+0d416ca (origin/feature/image-doctor) resolvendo erro de imagens
+e405cc5 WIP: alterações locais
+bb4cc38 Ajustes no .gitignore
+953a4e7 WIP: alterações locais
+debc92d chore(calendar): adjust naming for calendar component consistency
+ae637c4 fix/errors-medical-page
+df530f7 Merge pull request 'Adicionando calendario interativo do medico' (#6) from feature/crud-medico into develop
+94839cc (origin/feature/crud-medico, feature/crud-medico) Adicionando calendario interativo do medico
+93a4389 fix(merge): prefer feature versions (layout.tsx, package-lock.json)
+f2db866 (feature/patient-register) fix(merge): resolve conflicts between develop and feature/patient-register
+cdd44da chore: save changes before switching branch
+b2a9ea0 (origin/feature/patient-register) feat(api): add and wire all mock endpoints
+a1ba4e5 Merge pull request 'feature/scheduling' (#5) from feature/scheduling into develop
+40f05ca (origin/feature/scheduling) ajeitando erro dos botões
+a9d093e  adicionando agendamento-incompleto
+6ca8524 Merge pull request 'feat: add medical page' (#4) from feature/crud-medico into develop
+7385e64 feat: add medical page
+a44e9bc Merge branch 'feature/patient-register' of https://git.popcode.com.br/RiseUP/riseup-squad20 into feature/patient-register
+372383f feat: connect patient registration form to create patient API
+3cce8a9 fix: fix ref error in actions menu
+91c84b6 fix: secure setting of onOpenChange on the patient form
+8258fac feat: implement patient recorder
+20d070e (origin/feature/patient-list, feature/patient-list) chore: remove Website folderfrom repository
+0ba1590 feat: add initial project files and patient list
+631f7f2 (origin/feature/cadastro-pacientes, origin/developer, feature/cadastro-pacientes) feat: add initial structure
+6414f69 (origin/main, origin/HEAD) Initial commit