Commit 313c8709 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'update' into 'master' 

Including IntelliJ metadata

See merge request !3
parents 8ab7d979 001df460

.idea/description.html

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
<html>Simple <b>Java</b> application that includes a class with <code>main()</code> method</html>
 
 No newline at end of file

.idea/encodings.xml

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="Encoding" addBOMForNewFiles="with NO BOM" />

</project>
 
 No newline at end of file

.idea/misc.xml

+1 −10
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="EntryPointsManager">

    <entry_points version="2.0" />

  </component>

  <component name="ProjectKey">

    <option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/out" />

  </component>

  <component name="SvnBranchConfigurationManager">

    <option name="mySupportsUserInfoFilter" value="true" />

  </component>

</project>
 
 No newline at end of file

.idea/modules.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<project version="4">

  <component name="ProjectModuleManager">

    <modules>

      <module fileurl="file://$PROJECT_DIR$/hw2p2.iml" filepath="$PROJECT_DIR$/hw2p2.iml" />

      <module fileurl="file://$PROJECT_DIR$/hw1p3.iml" filepath="$PROJECT_DIR$/hw1p3.iml" />

    </modules>

  </component>

</project>
 
 No newline at end of file

.idea/project-template.xml

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
<template>

  <input-field default="com.company">IJ_BASE_PACKAGE</input-field>

</template>
 
 No newline at end of file