Merge remote-tracking branch 'origin/main' into main
# Conflicts: # README.md
This commit is contained in:
commit
8196beb62c
5 changed files with 12 additions and 4 deletions
BIN
Projet-GL.pdf
Normal file
BIN
Projet-GL.pdf
Normal file
Binary file not shown.
|
|
@ -5,15 +5,13 @@
|
||||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="org.apache.maven.plugins:maven-surefire-plugin:2.22.2" level="project" />
|
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
|
||||||
|
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
|
||||||
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
|
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,11 @@ Le projet se compose d'un groupe de 4 personnes :
|
||||||
|
|
||||||
## Liens Utiles
|
## Liens Utiles
|
||||||
- [Sujet du Projet](https://github.com/NyxiumYuuki/ProjetGenieLogicielLoto/blob/main/Projet-GL.pdf)
|
- [Sujet du Projet](https://github.com/NyxiumYuuki/ProjetGenieLogicielLoto/blob/main/Projet-GL.pdf)
|
||||||
|
- [Information réunion](https://docs.google.com/document/d/17GW6Tm3U7TTt2mmF_BsABNsuf4z7Tq6mvUyYG6RrcKw/edit)
|
||||||
- [GitHub Project](https://github.com/users/NyxiumYuuki/projects/3)
|
- [GitHub Project](https://github.com/users/NyxiumYuuki/projects/3)
|
||||||
- [GitHub Repository](https://github.com/NyxiumYuuki/ProjetGenieLogicielLoto)
|
- [GitHub Repository](https://github.com/NyxiumYuuki/ProjetGenieLogicielLoto)
|
||||||
- [Visual SiteMap on GlooMaps](https://www.gloomaps.com/MZjgQh64zw)
|
- [Visual SiteMap on GlooMaps](https://www.gloomaps.com/MZjgQh64zw)
|
||||||
|
- [Visual SiteMap Class on GlooMaps](https://www.gloomaps.com/q4hm67fsaR)
|
||||||
- [Quick Setup of Git on VSCode](https://github.com/NyxiumYuuki/Projet-C-Huffman/blob/master/README.md)
|
- [Quick Setup of Git on VSCode](https://github.com/NyxiumYuuki/Projet-C-Huffman/blob/master/README.md)
|
||||||
|
|
||||||
## Livrable
|
## Livrable
|
||||||
|
|
|
||||||
7
src/main/java/test.java
Normal file
7
src/main/java/test.java
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
public class test{
|
||||||
|
public static void main(String[] args){
|
||||||
|
System.out.println("yes");
|
||||||
|
System.out.println("Changement fait par Maxime HAVGOUDOUKIAN");
|
||||||
|
}
|
||||||
|
}
|
||||||
1
test.txt
Normal file
1
test.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
azersdfglkjqnv,osdgfithez
|
||||||
Reference in a new issue