merge conflicts

egovernments · Nov 18, 2024 · cb5fd0f · cb5fd0f
1 parent 0a7d0de
commit cb5fd0f
Show file tree

Hide file tree

Showing 7 changed files with 674 additions and 122 deletions.
diff --git a/packages/attendance_management/pubspec.lock b/packages/attendance_management/pubspec.lock
@@ -324,9 +324,11 @@ packages:
   dart_mappable_builder:
     dependency: "direct dev"
     description:
-      path: "../dart_mappable_builder"
-      relative: true
-    source: path
+      path: "packages/dart_mappable_builder"
+      ref: master
+      resolved-ref: "8011a4c367094dfb018fce701d700a582ba862bb"
+      url: "https://github.com/egovernments/health-campaign-field-worker-app/"
+    source: git
     version: "4.2.0"
   dart_style:
     dependency: transitive
@@ -363,9 +365,10 @@ packages:
   digit_data_model:
     dependency: "direct main"
     description:
-      path: "../digit_data_model"
-      relative: true
-    source: path
+      name: digit_data_model
+      sha256: "0e5a1f8c5f0548e573af9c0279942f2dbc332042865614e0b89fe5952002ef1f"
+      url: "https://pub.dev"
+    source: hosted
     version: "1.0.4"
   digit_ui_components:
     dependency: "direct main"