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

Remove all git merge conflict tags in SDG source code Javadoc [DATAGEODE-90] #137

Closed
spring-projects-issues opened this issue Mar 21, 2018 · 0 comments

Comments

@spring-projects-issues
Copy link

@spring-projects-issues spring-projects-issues commented Mar 21, 2018

John Blum opened DATAGEODE-90 and commented

SDG source code Javadoc contains git merge conflict tags of the nature...

<<<<<<< HEAD
...
=======
...
>>>>>>> c22ebe6... DATAGEODE-12 - Introduce Spring Configurers to flexibly alter Spring Data GemFire configuration when using Annotation config.

Affects: 2.0.5 (Kay SR5), 2.1 M1 (Lovelace)

Backported to: 2.0.6 (Kay SR6)

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

Successfully merging a pull request may close this issue.

None yet
2 participants