mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 00:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflict resolved

Browse source
This commit is contained in:
K3rn3l_P4n1c 2023-09-15 19:47:24 +03:00
parent aae17f679a
commit 5736e878df
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/dialogs/nextLevel.js
View file

@ -216,17 +216,10 @@ exports.dialog = {
type: 'ModalAlert',
options: {
markdowns: [
<<<<<<< HEAD
'## Muhteşem!!!',
'',
'Bu seviyeyi *{numCommands}* komut ile çözdünüz.',
'İdeal çözüm {best} komuttan oluşuyor.'
=======
'## Mükemmel!!!',
'',
'*{numCommands}* komut ile bu seviyeyi çözdün!; ',
'İdeal çözüm {best} komut içeriyor.'
>>>>>>> main
]
}
}],