unknown
81c4347cf1
Conflicts: platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin platforms/android/.idea/workspace.xml platforms/android/assets/www/templates/tab-buys.html platforms/android/build/intermediates/assets/debug/www/templates/tab-buys.html platforms/android/build/intermediates/gradle_project_sync_data.bin platforms/android/build/intermediates/res/resources-debug.ap_ platforms/android/build/outputs/apk/android-debug-unaligned.apk platforms/android/build/outputs/apk/android-debug.apk platforms/android/local.properties www/templates/tab-buys.html
35 lines
1.3 KiB
XML
35 lines
1.3 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
<OptionsSetting value="true" id="Add" />
|
|
<OptionsSetting value="true" id="Remove" />
|
|
<OptionsSetting value="true" id="Checkout" />
|
|
<OptionsSetting value="true" id="Update" />
|
|
<OptionsSetting value="true" id="Status" />
|
|
<OptionsSetting value="true" id="Edit" />
|
|
<ConfirmationsSetting value="0" id="Add" />
|
|
<ConfirmationsSetting value="0" id="Remove" />
|
|
</component>
|
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
|
</component>
|
|
<component name="ProjectType">
|
|
<option name="id" value="Android" />
|
|
</component>
|
|
<component name="masterDetails">
|
|
<states>
|
|
<state key="ProjectJDKs.UI">
|
|
<settings>
|
|
<last-edited>1.8</last-edited>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
</states>
|
|
</component>
|
|
</project> |