resolved merge conflicts

2026-06-01 18:00:44 +03:00
parent bb49bbd0f7 406b2bc2dc
commit 10c21e4ae3
112 changed files with 2641 additions and 1586 deletions
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: be_happy
 description: ""
 publish_to: 'none'

-version: 1.0.0+11
+version: 1.0.0+12

 environment:
  sdk: ^3.8.1
@@ -54,6 +54,11 @@ flutter:
    - assets/
    - assets/icons/

+  fonts:
+    - family: "DigitalNumbers"
+      fonts:
+        - asset: assets/fonts/DigitalNumbers-Regular.ttf
+

  # fonts:
  #   - family: Schyler