Fix rapide du texte

blog/static/blog/css/nav.css

@@ -2,7 +2,11 @@
 * @Author: klmp200
 * @Date:   2016-07-10 16:06:30
 * @Last Modified by:   klmp200
+<<<<<<< HEAD
 * @Last Modified time: 2016-10-02 20:55:56
+=======
+* @Last Modified time: 2016-10-02 18:22:12
+>>>>>>> 341e7a94e5a4e2db16db4201f1603b9c9425c705
 */
 
 #navbar {
@@ -90,4 +94,4 @@
 
 .navbar-default-gala {
 	// border-bottom: 3px #b2810e solid;
-}
\ No newline at end of file
+}