Commit 051e9d17afbbfd5c233b2ff90ed077d635fa65fa
fix merge conflict
gb committed on 9/15/2016, 10:06:45 PMParent: 32b48f9b3bd44dcb3bb24b0d9cea7a213f409121
Parent: bc4aa6ed1ef001daa3e8a571b233e7de0d47ea84
Files changed
| layouts/navbar.jade | changed |
| layouts/navbar.jade | |||
|---|---|---|---|
| @@ -1,10 +1,8 @@ | |||
| 1 | 1 … | .navbar | |
| 2 | 2 … | .contain | |
| 3 | 3 … | .twelve.col | |
| 4 | 4 … | ul | |
| 5 | - li <a href="/">Gwen Bell</a> | ||
| 5 … | + li <a href="/"><b>gb</b></a> | ||
| 6 | 6 … | li <a href="http://gwenbell.com/#about">About</a> | |
| 7 | 7 … | li <a href="http://gwenbell.com//blog">Blog</a> | |
| 8 | 8 … | li <a href="http://gwenbell.com/#contact">Contact</a> | |
| 9 | - li <a href="http://gwenbell.com/#details">Technical Details</a> | ||
| 10 | - li <a href="http://gwenbell.com/#subscribe">Subscribe</a> | ||
Built with git-ssb-web