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 ysy_turk

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
This commit is contained in:
yadavendras
2017-01-25 10:47:58 +05:30
parent c5efee08d6
commit 16bdac6be1
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
-2
View File
@@ -3,8 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
</modules>
</component>