Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source (2)

update · e0c27ead
thibault.capt authored 2 years ago

e0c27ead
Merge remote-tracking branch 'origin/main' into main · 9c0c2cd1
thibault.capt authored 2 years ago
```
# Conflicts:
#	src/META-INF/MANIFEST.MF
```
9c0c2cd1

Hide whitespace changes

Inline Side-by-side

Showing with 9 additions and 3 deletions

View file @ 9c0c2cd1

 Manifest-Version: 1.0
 Main-Class: Main
 <<<<<<< HEAD
 Manifest-Version: 1.0
 Main-Class: Main
 =======
 Manifest-Version: 1.0
 Main-Class: Main
 >>>>>>> origin/main