Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
MikeZyeman 2021-11-09 21:37:07 +01:00
commit 580eedd3c6
2 changed files with 3 additions and 11 deletions

View File

@ -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>

View File

@ -1,4 +1,6 @@
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class Text {