move ConflictsResolveDialog to conflict package

3049403

Select commit

Loading

Failed to load commit list.

Uh oh!

There was an error while loading. Please reload this page.

DCO

DCO

Task list completed

task-list-completed

Codacy Production

Codacy Static Code Analysis

Auto approve sync on: pull_request_target

Auto approve sync

Auto approve renovate PRs on: pull_request_target

auto-approve-merge

Unit tests on: pull_request

test

Screenshot Test on: pull_request 3

screenshot (Light, blue, 28)

Analysis on: pull_request

analysis

Assemble on: pull_request 1

flavor (Generic)

flavor (Gplay)

flavor (Huawei)

Check on: pull_request

check (detekt)

check (spotlessKotlinCheck)

check (lint)

Garm on: pull_request

test (master, 29)

REUSE Compliance Check on: pull_request

reuse-compliance-check

Detect new java files on: pull_request 7

detectNewJavaFiles

Detect wrong settings on: pull_request

detectWrongSettings

Lint translation files on: pull_request

translations-string-xml

QA on: pull_request 1

qa

AI Policy on: pull_request

check-ai-trailers

CodeQL on: pull_request 1

Analyze (java)

Auto approve sync on: pull_request_target

Auto approve sync

Code scanning results

CodeQL

Select a check to view from the sidebar