diff options
| author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-12-08 14:33:39 +0100 |
|---|---|---|
| committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-12-08 14:33:39 +0100 |
| commit | f9d930da33a4a31aac2578b9943271d6340623d2 (patch) | |
| tree | e9a77ac5218292c4a93458db5e028c9ee6a897f5 /Client/BrzoDoLokacije/app/src/main/res/layout | |
| parent | a3dbcdcfbe171ea84fe6870d2d49bf95fe9de148 (diff) | |
| parent | 12677dfc9558c7eecad158b5620b4640a67e06b3 (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
# Conflicts:
# Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityChangePassword.kt
# Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt
# Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentMyProfileInfo.kt
Diffstat (limited to 'Client/BrzoDoLokacije/app/src/main/res/layout')
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml | 1 | ||||
| -rw-r--r-- | Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml index a7a1d5f..dc8243e 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_password.xml @@ -154,7 +154,6 @@ android:hint="Unesi novu lozinku" android:inputType="textPassword" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/changeDataNewPasswordConfirmInputt" /> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml index 2d9dfd5..d5d72d1 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile_statistics.xml @@ -86,6 +86,6 @@ android:layout_height="match_parent" /> </LinearLayout> - + </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file |