Skip to content

GitLab

Commit 4912f66c authored by Sai Srinivas's avatar Sai Srinivas
Browse files

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	lib/Screens/HomeScreen.dart
#	lib/Screens/complaintListScreen.dart
#	lib/Screens/generatorDetailsScreen.dart
#	lib/Services/api_URLs.dart
#	lib/main.dart
parents f3a137b2 f693e7f1
Hide whitespace changes
Inline Side-by-side
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment