Open
Conversation
# Conflicts: # app/src/main/AndroidManifest.xml
Event optimised
Added Price coloumn in Storeroom .
Added Price coloumn in Storeroom .
Store Added Todo: Modify logo activity to suit needs Event removed (use yours)
Store Added Todo: Modify logo activity to suit needs Event removed (use yours)
Store Added Todo: Modify logo activity to suit needs Event removed (use yours)
# Conflicts: # .idea/inspectionProfiles/Project_Default.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # build.gradle
# Conflicts: # .idea/inspectionProfiles/Project_Default.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # build.gradle
# Conflicts: # .idea/gradle.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/java/com/zconnect/login/zconnect/logIn.java # app/src/main/res/layout/activity_home.xml # app/src/main/res/layout/activity_log_in.xml # app/src/main/res/layout/activity_logo.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml
# Conflicts: # .idea/gradle.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/java/com/zconnect/login/zconnect/logIn.java # app/src/main/res/layout/activity_home.xml # app/src/main/res/layout/activity_log_in.xml # app/src/main/res/layout/activity_logo.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
# Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/HomeActivity.java # app/src/main/java/com/zconnect/login/zconnect/ProductsTab.java # app/src/main/java/com/zconnect/login/zconnect/logo.java # app/src/main/res/layout/content_home.xml
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
* Event optimised * Event optimised * Update AndroidManifest.xml * Event feature , with Float Action Button * Event feature , with Float Action Button * Event feature , with Float Action Button * Event feature , with Float Action Button * Post function Completed in StoreRoom Feature * Store Room Completed * fix * fix * fix * Store Room Completed * Store Room Completed * Store Room Completed * Store Room Completed * Implemented Recycler View . Added Price coloumn in Storeroom . * Implemented Recycler View . Added Price coloumn in Storeroom . * Search Added Store Added Todo: Modify logo activity to suit needs Event removed (use yours) * Search Added Store Added Todo: Modify logo activity to suit needs Event removed (use yours) * Search Added Store Added Todo: Modify logo activity to suit needs Event removed (use yours) * Merge remote-tracking branch 'remotes/upstream/storeRoom' into TryRebase # Conflicts: # .idea/inspectionProfiles/Project_Default.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # build.gradle * Merge remote-tracking branch 'remotes/upstream/storeRoom' into TryRebase # Conflicts: # .idea/inspectionProfiles/Project_Default.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # build.gradle * XzXZX * Merge remote-tracking branch 'upstream/master' # Conflicts: # .idea/gradle.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/java/com/zconnect/login/zconnect/logIn.java # app/src/main/res/layout/activity_home.xml # app/src/main/res/layout/activity_log_in.xml # app/src/main/res/layout/activity_logo.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml * Merge branch 'master' of https://github.com/G-LOKi/ZConnect into PullTry # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png * Merge branch 'master' of https://github.com/G-LOKi/ZConnect into PullTry # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/zconnect/login/zconnect/NewUser.java # app/src/main/java/com/zconnect/login/zconnect/home.java # app/src/main/res/drawable/RoomNecessities.png # app/src/main/res/drawable/room_necessities.png # app/src/main/res/drawable/roomnecessities.png
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Earlier one was closed because of some modifications I made for shop feature .
merge this one please