Skip to content
Snippets Groups Projects
Commit b00992ce authored by thibault.capt's avatar thibault.capt
Browse files

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

# Conflicts:
#	src/Main.java
#	src/Simplex2.java
parents e8364d4e a6405613
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
.gitignore
+ 2
− 1
View file @ b00992ce
......@@ -219,3 +219,4 @@ replay_pid*
*.Identifier
log.txt
/.idea/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment