Mess up in merge conflict resolution.

borderitsolutions / amadaa

Amadaa means plantain in Gã.

MIT License

0 stars 5 forks source link

Mess up in merge conflict resolution. #228

Closed lcabrini closed 8 years ago

lcabrini commented 8 years ago

@SirMac I think I messed up a bit when I was trying to resolve a merge conflict. As a result, the menu is now gone, replace by a bullet list. Would you be able to fix this?

lcabrini commented 8 years ago

Actually, I'm studying the output from view source, and I'm not sure this was done by the merge conflict resolution. I think we have a DIV within a UL. Not sure that is correct.

SirMac commented 8 years ago

I will check it.

BorderITS commented 8 years ago

this working I'm closing this issue