bug: merge conflict markers committed to development branch #94

New issue

Closed

opened 2026-04-16 18:10:55 +00:00 by zaelgohary · 0 comments

zaelgohary commented

2026-04-16 18:10:55 +00:00

Member

Description

hero_compute_server has unresolved merge conflict markers in constants.rs, osis_server_generated.rs, and tests.rs on the development branch, preventing compilation.

Fix

Resolve conflicts by keeping the incoming version.

## Description hero_compute_server has unresolved merge conflict markers in constants.rs, osis_server_generated.rs, and tests.rs on the development branch, preventing compilation. ## Fix Resolve conflicts by keeping the incoming version.