fix rebase issue

This commit is contained in:
Denise Schannon
2018-09-18 14:00:53 -07:00
parent 196c2a5056
commit db4ca034e7
-4
View File
@@ -146,12 +146,8 @@ weight = "4"
[[menu.main]]
identifier = "learn"
name = "Learn"
<<<<<<< HEAD
url = "https://rancher.com/learn/"
weight = "4"
=======
weight = "5"
>>>>>>> add customers to main nav
pre = "<i class='material-icons'>keyboard_arrow_down</i>"
[[menu.main]]