added presentation
This commit is contained in:
		
						commit
						0f77ed09d3
					
				
					 2 changed files with 10 additions and 0 deletions
				
			
		
							
								
								
									
										6
									
								
								content/presentations/global_ethics.md
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										6
									
								
								content/presentations/global_ethics.md
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
					@ -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"
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
| 
						 | 
					@ -34,7 +34,11 @@
 | 
				
			||||||
           <p></p>
 | 
					           <p></p>
 | 
				
			||||||
         </div>
 | 
					         </div>
 | 
				
			||||||
       </div>
 | 
					       </div>
 | 
				
			||||||
 | 
					<<<<<<< HEAD
 | 
				
			||||||
       {{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
 | 
					       {{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
 | 
				
			||||||
 | 
					=======
 | 
				
			||||||
 | 
					       {{ range first 5 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }}
 | 
				
			||||||
 | 
					>>>>>>> ad061bf5da969819ab07a42ecac5fa2069916a04
 | 
				
			||||||
       <div class="units-row-end">
 | 
					       <div class="units-row-end">
 | 
				
			||||||
        <div class="unit-33 dateblock">
 | 
					        <div class="unit-33 dateblock">
 | 
				
			||||||
          <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
 | 
					          <h3><a href="{{ .Permalink }}">{{ .Title }}</a></h3>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue