Merge branch 'master' into ysy_total

2017-01-12 19:09:06 +05:30
parent d3606ada7b b8765256a6
commit 264814cbd2
2 changed files with 1 additions and 2 deletions
@@ -282,7 +282,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
        }
    }

-
    private static boolean updateResources(Context context, String language) {

        String lang ;
@@ -111,4 +111,4 @@
    <!--Gagan start new code 2-->
    <string name="stock_facing_planogram_dialog_title">Planogram</string>
    <!--Gagan end new code 2-->
-</resources>
+</resources>