fixing broken git piece
This commit is contained in:
		
							parent
							
								
									aca74efeac
								
							
						
					
					
						commit
						0e2fd08b26
					
				
					 1 changed files with 1 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -23,10 +23,8 @@ weight: 70
 | 
			
		|||
 | 
			
		||||
Chris and Abbie Cochrun serve together on TFC Staff! Chris grew up in Agra KS as a part of the Eastern Heights TFC group, Abbie grew up as a part of the Northern Valley TFC group and they got to know each other through TFC! Chris handles a lot of IT and video related things for TFC and Abbie is TFC’s unofficial graphic designer.
 | 
			
		||||
 | 
			
		||||
<<<<<<< HEAD:content/staff/chris-and-abbie-cochrun/index.md
 | 
			
		||||
You can check out my own website at [cochrun.xyz](https://cochrun.xyz)!
 | 
			
		||||
=======
 | 
			
		||||
 | 
			
		||||
If you'd like to read our newsletters, check them out here!
 | 
			
		||||
 | 
			
		||||
{{< spacing >}}
 | 
			
		||||
>>>>>>> 3b7e397 (updates to blowfish and adding newsletters in cochrun page):content/staff/chris-and-abbie-cochrun/_index.md
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue