Merge branch 'andy/merge_camera' of https://devone.aplikasi.web.id/gitea/sindhu/app_petikes into andy/merge_camera

2024-01-17 13:43:58 +07:00
parent 431c4f0039 1696e47cd3
commit 01e4fccb08
1 changed files with 3 additions and 0 deletions
--- a/app_petty_cash/pubspec.lock
+++ b/app_petty_cash/pubspec.lock
@@ -408,6 +408,7 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.17.0"
+<<<<<<< HEAD
  js:
    dependency: transitive
    description:
@@ -424,6 +425,8 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.8.1"
+=======
+>>>>>>> 1696e47cd3c38c9dd74f2ad18bd84091fc6c92fa
  lints:
    dependency: transitive
    description: