merged, conflict resolved
This commit is contained in:
parent
cece1f3779
commit
dcc59293ba
|
@ -1 +1,3 @@
|
||||||
|
|
||||||
<div class="orange">{{ name }}:</div> {{ short_bio }}
|
<div class="orange">{{ name }}:</div> {{ short_bio }}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user