mirror of
https://github.com/aquatix/dotfiles.git
synced 2025-12-06 22:55:10 +01:00
Vocabulary, resolved merge conflict
This commit is contained in:
@@ -75,8 +75,7 @@ Hoenderloo
|
|||||||
Garmin
|
Garmin
|
||||||
Termux
|
Termux
|
||||||
varkenssaté
|
varkenssaté
|
||||||
<<<<<<< HEAD
|
|
||||||
e-reader
|
e-reader
|
||||||
=======
|
|
||||||
tomatenplant
|
tomatenplant
|
||||||
>>>>>>> 6242ca7a686cfbb12f478747f8d5bb52845f6a4c
|
macarons
|
||||||
|
bijgekletst
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user