Skip to content

Actions: Ouaz/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
124 workflow runs
124 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update French.properties Conflict marking #221: Commit b2cdb82 pushed by Ouaz
January 19, 2025 19:55 9s patch-1
patch-1
January 19, 2025 19:55 9s
Update French.properties Conflict marking #220: Commit f8e3c46 pushed by Ouaz
January 12, 2025 18:24 14s patch-1
patch-1
January 12, 2025 18:24 14s
Update French.properties Conflict marking #219: Commit 1cd5bbd pushed by Ouaz
January 12, 2025 18:18 14s patch-1
patch-1
January 12, 2025 18:18 14s
Update French.properties Conflict marking #218: Commit ccf50cf pushed by Ouaz
January 8, 2025 17:49 11s patch-1
patch-1
January 8, 2025 17:49 11s
Update French.properties Conflict marking #217: Commit ed22f20 pushed by Ouaz
January 5, 2025 19:37 10s patch-1
patch-1
January 5, 2025 19:37 10s
Update French.properties Conflict marking #216: Commit da8d669 pushed by Ouaz
December 22, 2024 19:28 10s patch-1
patch-1
December 22, 2024 19:28 10s
Update French.properties Conflict marking #215: Commit b2ba4e1 pushed by Ouaz
December 16, 2024 18:40 14s patch-1
patch-1
December 16, 2024 18:40 14s
Update French.properties Conflict marking #214: Commit 292ab7f pushed by Ouaz
December 2, 2024 19:45 12s patch-1
patch-1
December 2, 2024 19:45 12s
Update French.properties Conflict marking #213: Commit fba7456 pushed by Ouaz
November 19, 2024 18:54 12s patch-1
patch-1
November 19, 2024 18:54 12s
Update French.properties Conflict marking #212: Commit fb4c433 pushed by Ouaz
November 10, 2024 16:21 13s patch-1
patch-1
November 10, 2024 16:21 13s
Update French.properties Conflict marking #211: Commit 36ff1f4 pushed by Ouaz
November 6, 2024 20:47 13s patch-1
patch-1
November 6, 2024 20:47 13s
Update French.properties Conflict marking #210: Commit db692b6 pushed by Ouaz
November 3, 2024 19:32 10s patch-1
patch-1
November 3, 2024 19:32 10s
Update French.properties Conflict marking #209: Commit 127492d pushed by Ouaz
October 29, 2024 20:50 11s patch-1
patch-1
October 29, 2024 20:50 11s
Update French.properties Conflict marking #208: Commit 1022666 pushed by Ouaz
October 22, 2024 18:18 13s patch-1
patch-1
October 22, 2024 18:18 13s
Update French.properties Conflict marking #207: Commit 34239fa pushed by Ouaz
October 20, 2024 18:49 10s patch-1
patch-1
October 20, 2024 18:49 10s
Update French.properties Conflict marking #206: Commit ba3e7e9 pushed by Ouaz
October 14, 2024 15:40 16s patch-1
patch-1
October 14, 2024 15:40 16s
Update French.properties Conflict marking #205: Commit 7f3cfde pushed by Ouaz
October 11, 2024 17:45 12s patch-1
patch-1
October 11, 2024 17:45 12s
Update French.properties Conflict marking #204: Commit e376ad9 pushed by Ouaz
October 6, 2024 17:43 10s patch-1
patch-1
October 6, 2024 17:43 10s
Update French.properties Conflict marking #203: Commit de6360f pushed by Ouaz
September 29, 2024 20:11 14s patch-1
patch-1
September 29, 2024 20:11 14s
Update French.properties Conflict marking #202: Commit 44a58e0 pushed by Ouaz
September 26, 2024 17:37 16s patch-1
patch-1
September 26, 2024 17:37 16s
Update French.properties Conflict marking #201: Commit f22a2cf pushed by Ouaz
September 17, 2024 18:22 11s patch-1
patch-1
September 17, 2024 18:22 11s
Fix missing brackets Conflict marking #200: Commit 0325f6a pushed by Ouaz
September 15, 2024 21:20 17s patch-2
patch-2
September 15, 2024 21:20 17s
Update French.properties Conflict marking #199: Commit eadf200 pushed by Ouaz
September 15, 2024 21:05 13s patch-1
patch-1
September 15, 2024 21:05 13s
Update French.properties Conflict marking #198: Commit 76f33bd pushed by Ouaz
September 13, 2024 19:42 12s patch-1
patch-1
September 13, 2024 19:42 12s
Update French.properties Conflict marking #197: Commit 2fa21a2 pushed by Ouaz
September 6, 2024 01:26 11s patch-1
patch-1
September 6, 2024 01:26 11s