Richard/restincode
1
0
Fork 0
mirror of https://github.com/restincode/restincode.git synced 2026-09-12 01:29:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue/56' of https://github.com/mauvehed/restincode into mauvehed-issue/56

Browse source
This commit is contained in:
mauvehed 2019-09-16 19:48:25 -05:00
commit 1645c00aa6
17 changed files with 102 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
people/bradsmith.json
View file

@ -4,12 +4,24 @@
"handle" : "Nurse",
"birth" : "",
"death" : "2011",
<<<<<<< HEAD
"mainimage" : "/images/y3t1_Art-Brad_Smith_aka_Nurse.jpg",
"maintext" : "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sit nisi eveniet expedita quo enim porro quia eaque at rerum. Eum ullam, sequi temporibus magnam optio dolorum at, id quod totam?</p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eaque perferendis quos facere. Aspernatur dolorum vitae sunt eum, dolores debitis repellat neque inventore pariatur at sed distinctio, maiores quas numquam repellendus.</p>",
=======
"mainimage" : "https://scontent.faus1-1.fna.fbcdn.net/v/t1.0-9/383907_243092799081415_2065644316_n.jpg?_nc_cat=108&_nc_oc=AQmpV52W7WyloJencX1_mzD2jyPURerWFVcjtxiVksvWrL3HXH91T8jsggPS7PPqqvY&_nc_ht=scontent.faus1-1.fna&oh=b77d4ba07ba2560cc9ca0a26e7c3e4f8&oe=5DF24B43",
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : [
{
"sitename" : "Facebook Memorial",
"siteurl" : "https://www.facebook.com/Remembering-Brad-Smith-The-Nurse-243091789081516/"
<<<<<<< HEAD
=======
}
],
"contributions" : [
{
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
}
],
"contributions" : "",