fix merge conflicts in friendlist
This commit is contained in:
parent
8e5a45dba7
commit
69cd75c0e7
1 changed files with 1 additions and 1 deletions
|
|
@ -32,8 +32,8 @@
|
|||
<div class="friendsubtitle-text">
|
||||
Check the online status of your friends or see who you're battling with!
|
||||
</div>
|
||||
<div class="stages-container" id="stages-container"></div>
|
||||
</div>
|
||||
<div class="stages-container" id="stages-container"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue