Skip to content

Commit aa55397

Browse files
annefergeranneferger
authored
Merge pull request #37 from digitalhumanists/feature/create-merge-conflict
Changed type of cake
2 parents f6e4aad + 68f4009 commit aa55397

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

‎Rezept.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
Kuchenrezept
22

33

4-
- Mehl
5-
- Süßstoff
6-
- Eier
7-
- Nutella
8-
- 0,5 kg Butter
9-
- Vanille
10-
- Schokolade
11-
- Magerquark
4+
- Blaubeeren
5+
- Cream Cheese
6+
- Öl
7+
- Mandelmehl
8+
- Ei
9+

0 commit comments

Comments
 (0)