resolvendo mesclagem

mdsreq-fga-unb · Dec 11, 2023 · c20300d · c20300d
2 parents 0bc0b34 + 07d85d7
commit c20300d
Show file tree

Hide file tree

Showing 2 changed files with 221 additions and 0 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,10 +20,15 @@
     "headlessui": "^0.0.0",
     "html2canvas": "^1.4.1",
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     "html2pdf.js": "^0.10.1",
     "jspdf": "^2.5.1",
 >>>>>>> 07d85d7 (Resolvendo bug anterior e modificando arquivo JSON para PDF - Outro bug de importacao a corrigir)
+=======
+    "html2pdf.js": "^0.10.1",
+    "jspdf": "^2.5.1",
+>>>>>>> refs/remotes/origin/53-baixar-plano
     "jsvectormap": "^1.5.3",
     "match-sorter": "^6.3.1",
     "react": "^18.2.0",