Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Angular brackets showing #10

Open
thehamzan6 opened this issue Apr 15, 2019 · 0 comments
Open

Angular brackets showing #10

thehamzan6 opened this issue Apr 15, 2019 · 0 comments

Comments

@thehamzan6
Copy link

There seem to be angular brackets with <<<<<<<<< HEAD and >>>>>>>>>>> DEV showing, as well as the content of the grid boxes duplicating.
xoox added a commit to oo-oo/hugo-w3-simple that referenced this issue Sep 19, 2019
@xoox
Fix merge conflict in c8ace73
104dbbc 
Commit c8ace73 has merge conflict not fixed for several months, which
was also reported in jesselau76#9 and jesselau76#10.
@xoox xoox mentioned this issue Sep 19, 2019
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@thehamzan6