Updated first feature (!10) · Merge requests · Dirk Sarpe / gitdemo · GitLab

Snippets Groups Projects

Open Josiane Sarah Rebecca Segar requested to merge js17bigy/gitdemo:wip/thinkofsomething into master 5 years ago

1 unresolved thread

Viewing commit fb4cf657

Show latest version

1 file

+ 2

− 1

fb4cf657

Updated first feature · fb4cf657
Josiane Segar authored 5 years ago

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

+ 2

− 1

@@ -3,4 +3,5 @@
- breaks stuff
- hurts
- no it is nice
- newest feature
- better feature here instead 