Fork: 0
nitta-lab / GitTest

Y ota #13

Merged y-ota merged 3 commits into nitta-lab:master from nitta-lab:y-ota on 5 Jun 2018
Patch
Unified Split
Showing 4 changed files
View
7
■■■■■
 .classpath 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="GitTest/src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
2
■■■■■
 .gitignore 0 → 100644
/bin/
View
18
■■■■■
 .project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>GitTest</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
View
2
■■■■■
 GitTest/src/Main.java
System.out.println("master側で競合が解消されたのを無視したままbranch1で更に変更");
System.out.println("新田直也");
System.out.println("a-matsumotoです．");
System.out.println("石谷涼");
System.out.println("ohta");
 
}
 
}