post merge issue

laurengranada · Mar 11, 2017 · a29b37e · a29b37e
1 parent 1ec173b
commit a29b37e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/views/post.handlebars b/views/post.handlebars
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 
 <html lang="en-us">
-<<<<<<< HEAD
 
 <head>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">