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

fix previously unresolved merge conflicts

Browse source
This commit is contained in:
mauvehed 2019-09-16 20:32:35 -05:00
parent 155ee3a71b
commit e0f29e576f
7 changed files with 1 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
people/_template.json
View file

@ -4,12 +4,9 @@
"handle" : "",
"birth" : "",
"death" : "",
<<<<<<< HEAD
"obituary" : "",
=======
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"mainimage" : "/images/face-silhouette-clipart.png",
"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>",
"maintext" : "",
"socialmedialinks" : [
{
"sitename" : "Twitter",

8
people/bradsmith.json
View file

@ -4,24 +4,16 @@
"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" : "",

4
people/joeengressia.json
View file

@ -5,11 +5,7 @@
"birth" : "",
"death" : "",
"mainimage" : "/images/face-silhouette-clipart.png",
<<<<<<< HEAD
"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>",
=======
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : "",
"contributions" : "",
"gallery" : ""

4
people/joerogers.json
View file

@ -5,11 +5,7 @@
"birth" : "",
"death" : "",
"mainimage" : "/images/face-silhouette-clipart.png",
<<<<<<< HEAD
"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>",
=======
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : "",
"contributions" : "",
"gallery" : ""

4
people/kriskaspersky.json
View file

@ -5,11 +5,7 @@
"birth" : "1976",
"death" : "2017",
"mainimage" : "/images/Kaspersky_Kris.JPG",
<<<<<<< HEAD
"maintext" : "The first article written by Kris was published when he was still in school. It was published by 'Astrologer' magazine, and the article itself was devoted to astronomy. In 1998 Kris began to contribute actively to conferences of FidoNet RU.HACKER. Dmitry Sadchenko noted his posts and arranged him a meeting with the representatives of publishing house 'Solon-Press'. In 1999 'Solon-Press' published the first book of Kris Kaspersky 'Technique and philosophy of hacker attacks' with 50 000 rubles of author's fee. A total of 16 books had been published by 2008, including several translations into English. The books were dedicated to data protection and program optimization, computer virus and disassembling. Among these books there's also 'Weatherlore Encyclopedia'. Kris's interest lies in the field of computers and astronomy. Some of his articles and forum topics concern telescopes and observation of the starry sky. Along with the books Kris contributes to such magazines as 'System administrator', 'Byte', 'Astrologer', 'Hacker'.",
=======
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : [
{
"sitename" : "Wikipedia",

4
people/michaelhamelin.json
View file

@ -5,11 +5,7 @@
"birth" : "",
"death" : "2015",
"mainimage" : "/images/face-silhouette-clipart.png",
<<<<<<< HEAD
"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>",
=======
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : [
{
"sitename" : "Twitter",

4
people/obsèquesdepaolo.json
View file

@ -5,11 +5,7 @@
"birth" : "",
"death" : "",
"mainimage" : "/images/face-silhouette-clipart.png",
<<<<<<< HEAD
"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>",
=======
"maintext" : "",
>>>>>>> 8f2bc3818b2a3119fe26155a234b6002aec7e5d6
"socialmedialinks" : "",
"contributions" : "",
"gallery" : ""