Merge branch 'master' of https://github.com/drewcassidy/drewcassidy.github.io

2018-01-01 00:47:41 -08:00
parent c7ae81f0ab 18df2a037c
commit ea6628971c
1 changed files with 4 additions and 0 deletions
--- a/_posts/2018-01-01-Raspbian-ntpd.md
+++ b/_posts/2018-01-01-Raspbian-ntpd.md
@ -1,5 +1,9 @@
 ---
+<<<<<<< HEAD
 title: Time-Zones and ntpd in Raspbian
+=======
+title: Raspbian Time-Zones and ntpd
+>>>>>>> e5b1b2f7cd7f430fc8e4fed10279a64fe0703a20
 tags: Raspberry-pi linux
 ---
 Setting the time zone in raspbian using `raspi-config` has strange results