From 5cc48cbcf130784f432e60ae17ff6f366cd6b21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilmann=20Z=C3=A4schke?= <tilmann.zaeschke@inf.ethz.ch>
Date: Tue, 16 Jul 2024 12:47:21 +0200
Subject: [PATCH] Rebase fix

---
 src/main/java/org/scion/jpan/internal/Segments.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/scion/jpan/internal/Segments.java b/src/main/java/org/scion/jpan/internal/Segments.java
index 645c60b9c..baedf2a10 100644
--- a/src/main/java/org/scion/jpan/internal/Segments.java
+++ b/src/main/java/org/scion/jpan/internal/Segments.java
@@ -319,7 +319,7 @@ private static List<Daemon.Path> combineTwoSegments(
   }
 
   private static Daemon.Path createShortCut(
-      Daemon.Path oldPath, int posUp, int posDown, ScionBootstrapper brLookup) {
+      Daemon.Path oldPath, int posUp, int posDown, LocalTopology brLookup) {
     System.out.println("Removing: " + posUp + " -> " + posDown);
     System.out.println("          " + ScionUtil.toStringPath(oldPath.getRaw().toByteArray()));