Loading .gitignore +1 −0 Original line number Diff line number Diff line Loading @@ -42,6 +42,7 @@ build/ .idea/navEditor.xml .idea/tasks.xml .idea/modules.xml .idea/misc.xml .idea/assetWizardSettings.xml .idea/markdown-navigator* .idea/compiler.xml Loading .idea/misc.xmldeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DesignSurface"> <option name="filePathToZoomLevelMap"> <map> <entry key="../../../../layout/custom_preview.xml" value="0.1" /> </map> </option> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" /> >>>>>>> Stashed changes </project> No newline at end of file Loading
.gitignore +1 −0 Original line number Diff line number Diff line Loading @@ -42,6 +42,7 @@ build/ .idea/navEditor.xml .idea/tasks.xml .idea/modules.xml .idea/misc.xml .idea/assetWizardSettings.xml .idea/markdown-navigator* .idea/compiler.xml Loading
.idea/misc.xmldeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DesignSurface"> <option name="filePathToZoomLevelMap"> <map> <entry key="../../../../layout/custom_preview.xml" value="0.1" /> </map> </option> </component> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" /> >>>>>>> Stashed changes </project> No newline at end of file