AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-10 18:15:48 +05:30
parent f6a0e466b4
commit a18d04ca5f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp"
android:weightSum="5"> android:weightSum="5">
<LinearLayout <LinearLayout
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2 -1
View File
@@ -23,7 +23,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp"
android:weightSum="5"> android:weightSum="5">
<LinearLayout <LinearLayout