nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Conflicts with no conflict

Tim__D

Sometimes when doiing a compare between different branches I get conflicts that are not really conflicts. There is nothing to accept or reject for either file and the basic extended attributes are the same? Has anyone else had this same issue?

- Tim

Find more posts tagged with

Comments

There are no comments yet