Skip to content

Actions: Ouaz/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
This workflow was disabled manually.
64 workflow runs
64 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update French.properties Conflict marking #278: Commit 843a961 pushed by Ouaz
7s patch-1
patch-1
7s
Update French.properties Conflict marking #274: Commit 3bb67de pushed by Ouaz
10s patch-1
patch-1
10s
Update French.properties Conflict marking #273: Commit 144eab4 pushed by Ouaz
8s patch-1
patch-1
8s
Update French.properties Conflict marking #272: Commit 5fb713f pushed by Ouaz
10s patch-1
patch-1
10s
Update French.properties Conflict marking #271: Commit 3bde027 pushed by Ouaz
9s patch-1
patch-1
9s
Update French.properties Conflict marking #270: Commit 198cdc2 pushed by Ouaz
9s patch-1
patch-1
9s
Update French.properties Conflict marking #269: Commit 698caf3 pushed by Ouaz
9s patch-1
patch-1
9s
Update French.properties Conflict marking #268: Commit 4b3f906 pushed by Ouaz
7s patch-1
patch-1
7s
Update French.properties Conflict marking #267: Commit 543d0e2 pushed by Ouaz
8s patch-1
patch-1
8s
Update French.properties Conflict marking #266: Commit 974481c pushed by Ouaz
9s patch-1
patch-1
9s
Update French.properties Conflict marking #265: Commit 4f7068b pushed by Ouaz
7s patch-1
patch-1
7s
Update French.properties Conflict marking #264: Commit a85f348 pushed by Ouaz
10s patch-1
patch-1
10s
Correct happiness value in Luxury resource article Conflict marking #263: Commit 227f74f pushed by Ouaz
8s fix-value
fix-value
8s
fix happiness value Conflict marking #262: Commit b9e18ab pushed by Ouaz
9s temp-value
temp-value
9s
Correct happiness value in Luxury resource article Conflict marking #261: Commit 952f63c pushed by Ouaz
8s temp-value
temp-value
8s
4.16.6 Conflict marking #260: Commit 2a26dc3 pushed by Ouaz
8s fix-value
fix-value
8s
4.16.6 Conflict marking #259: Commit 2a26dc3 pushed by Ouaz
7s master
master
7s
Fix toggle improvements button color Conflict marking #258: Commit 6c4710a pushed by Ouaz
9s fix-icon
fix-icon
9s
Fix toggle improvements button color Conflict marking #257: Commit 4e961f5 pushed by Ouaz
8s button
button
8s
Modding: Added misspelling tests for uniqueTo for buildings, units an… Conflict marking #256: Commit 846213b pushed by Ouaz
7s button
button
7s
Fix toggle improvement button color Conflict marking #255: Commit 3b7b717 pushed by Ouaz
9s button
button
9s
Modding: Added misspelling tests for uniqueTo for buildings, units an… Conflict marking #254: Commit 846213b pushed by Ouaz
8s fix-icon
fix-icon
8s
Modding: Added misspelling tests for uniqueTo for buildings, units an… Conflict marking #253: Commit 846213b pushed by Ouaz
9s master
master
9s
Update French.properties Conflict marking #252: Commit 4e318f3 pushed by Ouaz
9s patch-1
patch-1
9s
Update French.properties Conflict marking #251: Commit 7da6dcc pushed by Ouaz
9s patch-1
patch-1
9s