mirror of
https://github.com/monero-project/monero-site.git
synced 2024-11-17 08:18:03 +00:00
fixed merge conflict
This commit is contained in:
commit
f082536b93
1 changed files with 6 additions and 1 deletions
|
@ -168,7 +168,7 @@
|
|||
|
||||
- level: 4
|
||||
name: iCEBREAKER
|
||||
amount: 264.8
|
||||
amount: 256
|
||||
history: [3rd Dan on 2015-11-21]
|
||||
|
||||
- level: 3
|
||||
|
@ -386,3 +386,8 @@
|
|||
amount: 2
|
||||
history: [3rd Kyu on 2014-08-11]
|
||||
|
||||
- level: -4
|
||||
name: Evan Duffield (care of iCEBREAKER)
|
||||
amount: 1
|
||||
history: [4th Kyu on 2014-11-20]
|
||||
|
||||
|
|
Loading…
Reference in a new issue