Skip to content

Commit 117c680

Browse files
committed
fix: resolve OpenCodeHttpClient listSessions merge conflict on 3.0.x
1 parent 18167e4 commit 117c680

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

‎src/main/java/io/github/hiwepy/opencode/api/OpenCodeHttpClient.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ public List<Session> listSessions(String search, Integer limit, Integer start) {
9797

9898
public List<Session> listSessions(String search, Integer limit, Integer start,
9999
OpenCodeRequestContext context) {
100-
<<<<<<< HEAD
101-
HttpUrl.Builder urlBuilder = HttpUrl.get(url("/session")).newBuilder();
102-
if (search != null) urlBuilder.addQueryParameter("search", search);
103-
if (limit != null) urlBuilder.addQueryParameter("limit", String.valueOf(limit));
104-
if (start != null) urlBuilder.addQueryParameter("start", String.valueOf(start));
105-
=======
106100
Map<String, String> params = new HashMap<>();
107101
if (search != null) params.put("search", search);
108102
if (limit != null) params.put("limit", String.valueOf(limit));
@@ -112,7 +106,6 @@ public List<Session> listSessions(String search, Integer limit, Integer start,
112106
for (Map.Entry<String, String> entry : params.entrySet()) {
113107
urlBuilder.addQueryParameter(entry.getKey(), entry.getValue());
114108
}
115-
>>>>>>> main
116109
Request request = authedRequest(urlBuilder.build().toString(), context).get().build();
117110
return executeList(request, new TypeReference<List<Session>>() {});
118111
}

0 commit comments

Comments
 (0)