APP | Device Settings title + Merge conflict

jonascsantos · Dec 15, 2022 · 88772d3 · 88772d3
2 parents 25b6855 + dbe6428
commit 88772d3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/utils/firebase.js b/src/utils/firebase.js
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> dbe6428087ba866fb5051a8a46b3085ff5cc5f6a
 import firebase from 'firebase'
 import "firebase/storage";