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.

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

/output Compile Error #22

Closed
dlimcher opened this issue Apr 19, 2017 · 0 comments
Closed

/output Compile Error #22

dlimcher opened this issue Apr 19, 2017 · 0 comments

Comments

@dlimcher
Copy link

dlimcher commented Apr 19, 2017

I compiled the output directory on Lodestar 5 at UT-Austin and received this error:

../util/nodalattr/nodalattr.f90(328): error #5082: Syntax error, found '<' when expecting one of: <LABEL> <END-OF-STATEMENT> ; TYPE INTEGER REAL COMPLEX BYTE CHARACTER CLASS DOUBLE ...
<<<<<<< HEAD
^
../util/nodalattr/nodalattr.f90(346): error #5082: Syntax error, found '==' when expecting one of: <LABEL> <END-OF-STATEMENT> ; TYPE INTEGER REAL COMPLEX BYTE CHARACTER CLASS DOUBLE ...
=======
^

This is out of my expertise to resolve, any help would be greatly appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants