Squash commit message and resolve conflicts

atlp-rwanda · May 6, 2024 · dbf664d · dbf664d
2 parents fe1990e + 1bbc76a
commit dbf664d
Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/index.tsx b/app/index.tsx
@@ -42,5 +42,4 @@ export default function App() {
       {showOnboarding && <CreateNewPassword />} 
     </>
   );
-
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "@eslint/js": "^9.1.1",
     "@types/react": "~18.2.45",
     "@types/react-native": "^0.73.0",
+    "@types/react-native-indicators": "^0.16.6",
     "eslint": "^8.57.0",
     "eslint-plugin-react": "^7.34.1",
     "globals": "^15.1.0",
-Original file line number
+Diff line change
@@ @@ -42,5 +42,4 @@ export default function App() { @@
           {showOnboarding && <CreateNewPassword />}
         </>
       );
     }