GWL: Fix merge conflict (#12521) #1159

Sign in to view logs

Summary
Jobs
- Mint 22
  
  LMDE 6
Run details
- Usage
- Workflow file

Triggered via push November 26, 2024 13:59

mtwebster

master

Status Success

Total duration 4m 20s

Artifacts –

build.yml

on: push

Matrix: build / build

Annotations

10 errors

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: cinnamon.pot#L6494

trough ==> through

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: cinnamon.pot#L6498

trough ==> through

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-audio-video.directory#L78

Som ==> Some

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-audio-video.directory#L90

te ==> the, be, we, to

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-audio-video.directory#L182

meni ==> menu

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-audio-video.directory#L185

Meni ==> Menu

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-audio-video.directory#L188

te ==> the, be, we, to

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-c.directory#L55

Controle ==> Control, Controls, Controlled, Controller

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-c.directory#L65

te ==> the, be, we, to

build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22: files/usr/share/desktop-directories/cinnamon-development.directory#L89

te ==> the, be, we, to