Commitc9e08c4cRecorded3 May 2026Repositorysigil-log

Fix sigil-log 0.15 metadata conflict

Message

Remove conflict markers left by an autostash conflict, keep the 0.14.0 package version, declare Sigil ^0.15 compatibility, and keep the canonical 0.15 lock entries.

Changed
 package.sgl |  9 ---------
 sigil.lock  | 13 -------------
 2 files changed, 22 deletions(-)
Diff
package.sglmodified
@@ -5,21 +5,12 @@
5
6
(package
7
name: "sigil-log"
−8
<<<<<<< Updated upstream
8
version: "0.14.0"
−10
sigil: "^0.14"
−11
=======
−12
version: "0.13.1"
9
sigil: "^0.15"
−14
>>>>>>> Stashed changes
10
description: "Structured logging for Sigil"
11
url: "https://codeberg.org/sigil/sigil-log"
12
license: "BSD-3-Clause"
13
authors: (list "David Wilson <[email protected]>")
14
15
dependencies: (list
−21
<<<<<<< Updated upstream
−22
=======
−23
(from-git url: "codeberg:sigil/sigil" package: "sigil-stdlib" version: "^0.15")
−24
>>>>>>> Stashed changes
16
(from-git url: "codeberg:sigil/sigil-json" version: "^0.13.1")))
sigil.lockmodified
@@ -1,18 +1,6 @@
1
;; Auto-generated by sigil deps install. Do not edit.
2
(lock
3
(package name: "sigil-stdlib"
−4
<<<<<<< Updated upstream
−5
url: "codeberg:sigil/sigil-lang"
−6
ref: "^0.14"
−7
sha: "dba24e3fe531bc150bcf93444e764f87fb321850"
−8
package-selector: "sigil-stdlib"
−9
version: "0.14.1")
−10
(package name: "sigil-json"
−11
url: "codeberg:sigil/sigil-json"
−12
ref: "^0.13.1"
−13
sha: "811b63925399a663e4b7dd25fb0813d59d33f557"
−14
version: "0.13.1")
−15
=======
4
url: "codeberg:sigil/sigil"
5
ref: "^0.15"
6
sha: "6518595c6c0414df3cdd9e8a2bb026291317a4dd"
@@ -22,5 +10,4 @@
10
ref: "^0.13.1"
11
sha: "046651cf42ecbf6c7352f3286afcab21aa92af94"
12
version: "0.14.0")
−25
>>>>>>> Stashed changes
13
)