resolve conflict

shraddhaAswar · Aug 22, 2021 · 5e6eef4 · 5e6eef4
2 parents 755768e + a694c43
commit 5e6eef4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/aswarfile b/aswarfile
@@ -1 +1,4 @@
-shravya 
+
+hi shravya 
+how are you?
+