Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vpaturet committed Oct 16, 2024
1 parent 183d3f2 commit 7571816
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ void keepRegularTransfer() {
}

private static DecorateConsolidatedStopNames defaultFilter() {
var transitModel = TestStopConsolidationModel.buildTransitModel();
var timetableRepository = TestStopConsolidationModel.buildTimetableRepository();

var repo = new DefaultStopConsolidationRepository();
repo.addGroups(GROUPS);

var service = new DefaultStopConsolidationService(repo, transitModel);
var service = new DefaultStopConsolidationService(repo, timetableRepository);
return new DecorateConsolidatedStopNames(service);
}
}

0 comments on commit 7571816

Please sign in to comment.