Branche a rebase (!4) · Merge requests · Adiel Van Hecke / formation-git · GitLab

Snippets Groups Projects

Viewing commit 8a10ac5d

Show latest version

6 files

+ 71

− 50

Some changes are not shown

For a faster browsing experience, some files are collapsed by default.

8a10ac5d

Merge branch 'master' into 'branche-a-rebase' · 8a10ac5d
Adiel Van Hecke authored 9 months ago
```
# Conflicts:
#   code/main.py
```

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

code/main.py

+ 1

− 0

@@ -5,6 +5,7 @@ wordToEmoji = {
    'super': ':thumbs_up:',
    'coeur': ':red_heart:',
    'sourire': ':smiley:',
    'beurk':':nauseated_face:'
}