+3
-3
src/App.svelte
+3
-3
src/App.svelte
···
148
148
Object.entries(headHashes).sort(([, a]: any, [, b]: any) => b.length - a.length)
149
149
)
150
150
for (const instance of instances) {
151
-
if (Object.keys(sorted).length > 1 && Object.keys(sorted)[1] && sorted[Object.keys(sorted)[1]].includes(instance.url)) {
151
+
if (Object.keys(sorted).length > 1 && Object.keys(sorted)[0] && !sorted[Object.keys(sorted)[0]].includes(instance.url)) {
152
152
instance._conflict = true
153
153
instancesInConflict.push(instance.url)
154
154
}
···
202
202
}
203
203
204
204
function normalizedVersion(version: string) {
205
-
const m = version.trim().match(/^([^\s]+)\.\d+\.\d+\-[0-9a-f]+\+dirty$/)
205
+
const m = version.trim().match(/^([^\s]+)\.\d+\.\d+\-[0-9a-f]+(\+dirty|)$/)
206
206
if (m) {
207
-
return `${m[1]}+dev`
207
+
return `${m[1]}+dirty`
208
208
}
209
209
return version
210
210
}