[SGF-727] Remove all git merge conflict tags in SDG source code Javadoc - Spring JIRA

This issue belongs to an archived project. You can view it, but you can't modify it. Learn more

XML

Word

Printable

Details

Type: Task
Status: Closed
Priority: Trivial
Resolution: Complete
Affects Version/s: 2.0.5 (Kay SR5), 2.1 M1 (Lovelace)
Fix Version/s: 2.0.6 (Kay SR6), 2.1 M2 (Lovelace)
Labels:
- DataGemFire
- Javadoc
- PivotalGemFire
- Source
- Spring
Environment:
Spring Data GemFire

Sprint:
Lovelace M2 / M3

Description

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.

Attachments

Activity

People

Assignee:: John Blum

Reporter:: John Blum

Archiver:: Trevor Marshall

Last updater:: Mark Paluch

Dates

Due:: 21/Mar/18

Created:: 21/Mar/18 11:35 PM

Updated:: 04/Apr/18 3:27 PM

Resolved:: 23/Mar/18 5:15 AM

Archived:: 09/Feb/23 11:21 PM