misc.xmlを変更し、コンフリクトを解消

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code misc.xmlを変更し、コンフリクトを解消 README master
1 parent acda471 commit f83cf527ecca599b1a486adff9d066a744728535 t-tai authored on 20 Jul 2021

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          .idea/misc.xml
             <?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
    <option name="id" value="Android" />
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />

Show line notes below