diff --git a/content/presentations/global_ethics.md b/content/presentations/global_ethics.md new file mode 100755 index 0000000..7c4f83a --- /dev/null +++ b/content/presentations/global_ethics.md @@ -0,0 +1,6 @@ +--- +date: "2017-03-10T12:00:00+01:00" +title: "What are the ethics of the science and religion debate?" +host: "Centre for Global Ethics Seminar" +publishdate: "2017-03-10" +--- diff --git a/layouts/index.html b/layouts/index.html index 2136418..e6e6707 100755 --- a/layouts/index.html +++ b/layouts/index.html @@ -34,7 +34,11 @@
+<<<<<<< HEAD {{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }} +======= + {{ range first 5 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }} +>>>>>>> ad061bf5da969819ab07a42ecac5fa2069916a04