fix: remove leftover conflict markers from package.json #45

Merged
eraviart merged 1 commit from fix/package-json-conflict-markers into master 2026-10-14 20:20:11 +02:00
Owner

URGENT: the 3.8.0 version bump (#44) was merged with unresolved conflict markers; master's package.json is not parseable by npm. Removes the markers, syncs package-lock.json to 3.8.0. Validated: python json.load OK on both files.

URGENT: the 3.8.0 version bump (#44) was merged with unresolved conflict markers; master's package.json is not parseable by npm. Removes the markers, syncs package-lock.json to 3.8.0. Validated: python json.load OK on both files.
The 3.8.0 version bump was merged with unresolved conflict markers, leaving
master with a package.json that npm cannot parse.
eraviart merged commit 0af59e2548 into master 2026-10-14 20:20:11 +02:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
logiciels/tricoteuses-assemblee!45
No description provided.