Merge branch 'merger-bug' into 'master' (b12b6f2e) · Commits · Nelson Tavares de Sousa / TeeTime-Framework · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

TeeTime-Framework
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

b12b6f2e

Commit b12b6f2e authored 10 years ago by Christian Wulf

Downloads
- Plain Diff

Merge branch 'merger-bug' into 'master'

Merger bug

removed bug #65

See merge request !17

parents e4f9ac10 9c7a8657

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/teetime/stage/basic/merger/Merger.java 19 additions, 9 deletions

src/main/java/teetime/stage/basic/merger/Merger.java
src/test/java/teetime/stage/basic/merger/MergerTest.java 70 additions, 0 deletions

src/test/java/teetime/stage/basic/merger/MergerTest.java
src/test/java/teetime/stage/basic/merger/MergerTestingPipe.java 81 additions, 0 deletions

...st/java/teetime/stage/basic/merger/MergerTestingPipe.java

with 170 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment