Merge

titi0267 · Mar 2, 2024 · cf785e8 · cf785e8
2 parents 2b37aab + b00c71c
commit cf785e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -1,8 +1,8 @@
 name: Develop build
-# on:
-#   push:
-#     branches:
-#       - develop
+on:
+  push:
+    branches:
+      - develop
 
 jobs:
   android-build:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -90,7 +90,11 @@ jobs:
           body: |
             Release version ${{steps.version.outputs.prop}}
             Fetures:
+<<<<<<< HEAD
               - Itinerary from users position
               - User shown on the map
             Fix:
               - Itinerary infite loading
+=======
+              - Alert users that an update is available
+>>>>>>> b00c71c69e629d08113a52efb9e1e846eb9b2339
diff --git a/package.json b/package.json
@@ -1,7 +1,12 @@
 {
   "name": "gas-prices",
+<<<<<<< HEAD
   "version": "0.0.4",
   "versionCode": 10,
+=======
+  "version": "0.0.3",
+  "versionCode": 9,
+>>>>>>> b00c71c69e629d08113a52efb9e1e846eb9b2339
   "private": true,
   "scripts": {
     "android": "react-native run-android --variant=debug",