Merge branch 'master' into ysy_total
This commit is contained in:
-1
@@ -282,7 +282,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static boolean updateResources(Context context, String language) {
|
private static boolean updateResources(Context context, String language) {
|
||||||
|
|
||||||
String lang ;
|
String lang ;
|
||||||
|
|||||||
@@ -111,4 +111,4 @@
|
|||||||
<!--Gagan start new code 2-->
|
<!--Gagan start new code 2-->
|
||||||
<string name="stock_facing_planogram_dialog_title">Planogram</string>
|
<string name="stock_facing_planogram_dialog_title">Planogram</string>
|
||||||
<!--Gagan end new code 2-->
|
<!--Gagan end new code 2-->
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user