Merge remote-tracking branch 'origin/main'
This commit is contained in:
		
						commit
						2b147ed8cd
					
				| 
						 | 
					@ -1,8 +1,9 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
<module type="JAVA_MODULE" version="4">
 | 
					<module type="JAVA_MODULE" version="4">
 | 
				
			||||||
  <component name="NewModuleRootManager" inherit-compiler-output="true">
 | 
					  <component name="NewModuleRootManager" inherit-compiler-output="true">
 | 
				
			||||||
    <exclude-output />
 | 
					    <exclude-output />
 | 
				
			||||||
    <content url="file://$MODULE_DIR$">
 | 
					    <content url="file://$MODULE_DIR$">
 | 
				
			||||||
 | 
					      <sourceFolder url="file://$MODULE_DIR$/Test" isTestSource="true" />
 | 
				
			||||||
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
 | 
					      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
 | 
				
			||||||
    </content>
 | 
					    </content>
 | 
				
			||||||
    <orderEntry type="inheritedJdk" />
 | 
					    <orderEntry type="inheritedJdk" />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +0,0 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					 | 
				
			||||||
<project version="4">
 | 
					 | 
				
			||||||
  <component name="RunConfigurationProducerService">
 | 
					 | 
				
			||||||
    <option name="ignoredProducers">
 | 
					 | 
				
			||||||
      <set>
 | 
					 | 
				
			||||||
        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
 | 
					 | 
				
			||||||
      </set>
 | 
					 | 
				
			||||||
    </option>
 | 
					 | 
				
			||||||
  </component>
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,11 +0,0 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					 | 
				
			||||||
<module type="JAVA_MODULE" version="4">
 | 
					 | 
				
			||||||
  <component name="NewModuleRootManager" inherit-compiler-output="true">
 | 
					 | 
				
			||||||
    <exclude-output />
 | 
					 | 
				
			||||||
    <content url="file://$MODULE_DIR$">
 | 
					 | 
				
			||||||
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
 | 
					 | 
				
			||||||
    </content>
 | 
					 | 
				
			||||||
    <orderEntry type="inheritedJdk" />
 | 
					 | 
				
			||||||
    <orderEntry type="sourceFolder" forTests="false" />
 | 
					 | 
				
			||||||
  </component>
 | 
					 | 
				
			||||||
</module>
 | 
					 | 
				
			||||||
| 
						 | 
					@ -1,2 +1,6 @@
 | 
				
			||||||
public class TextEditor {
 | 
					public class TextEditor {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static void main(String[] args) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue