Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Srijan28jun #121

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open

Srijan28jun #121

wants to merge 80 commits into from

Conversation

srijan3110
Copy link

No description provided.

shadaab88 and others added 30 commits March 4, 2021 17:29
having continuous exceptions in chats.dart
MaterialButton, fixed pickedFile
issue in image_picker
# Conflicts:
#	lib/Changepassword/components/body.dart
#	lib/ComeraV/camera_screen.dart
#	lib/ComeraV/gallery.dart
#	lib/ComeraV/video_preview.dart
#	lib/Login/components/body.dart
#	lib/Signup/components/body.dart
#	lib/components/rounded_button.dart
#	lib/forgotpassword.dart
#	lib/resources/firebase_provider.dart
#	lib/resources/uploadimage.dart
#	lib/ui/Otheruser/other_aboutuser.dart
#	lib/ui/Otheruser/other_user.dart
#	lib/ui/Otheruser/otherfollowinglist.dart
#	lib/ui/ProfileEdit.dart
#	lib/ui/ProfilePage.dart
#	lib/ui/aboutuser.dart
#	lib/ui/followerlist.dart
#	lib/ui/followinglist.dart
#	lib/ui/messagingsystem.dart
#	lib/ui/post.dart
#	lib/ui/profilesettings.dart
#	lib/ui/searchlist.dart
#	lib/views/tabs/feeds.dart
#	lib/yammerly_gallery/gallery.dart
# Conflicts:
#	lib/ComeraV/camera_screen.dart
#	lib/Login/components/body.dart
#	lib/resources/firebase_provider.dart
# Conflicts:
#	lib/Changepassword/components/body.dart
#	lib/ComeraV/camera_screen.dart
#	lib/ComeraV/gallery.dart
#	lib/ComeraV/video_preview.dart
#	lib/Login/components/body.dart
#	lib/Signup/components/body.dart
#	lib/components/rounded_button.dart
#	lib/forgotpassword.dart
#	lib/resources/firebase_provider.dart
#	lib/resources/uploadimage.dart
#	lib/ui/Otheruser/other_aboutuser.dart
#	lib/ui/Otheruser/other_user.dart
#	lib/ui/Otheruser/otherfollowinglist.dart
#	lib/ui/ProfileEdit.dart
#	lib/ui/ProfilePage.dart
#	lib/ui/aboutuser.dart
#	lib/ui/followerlist.dart
#	lib/ui/followinglist.dart
#	lib/ui/messagingsystem.dart
#	lib/ui/post.dart
#	lib/ui/profilesettings.dart
#	lib/ui/searchlist.dart
#	lib/views/tabs/feeds.dart
#	lib/yammerly_gallery/gallery.dart
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants