]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d6c6669) | patch
mypy.ini: fix the unresolved conflict 39198/head
authorKefu Chai <kchai@redhat.com>
Mon, 1 Feb 2021 06:53:03 +0000 (14:53 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 1 Feb 2021 07:11:56 +0000 (15:11 +0800)
commit0c926d26cd3852d5ca53c6a8726915dee80fff15
tree0c3564a9902cbc76af0eb5fafa6143958948a937tree | snapshot
parentd6c6669032a46a2e1294d16561c6ff6aa151d030commit | diff
mypy.ini: fix the unresolved conflict

it was introduced by a0930a63106e9f0d556e18bd70ffca6566388742, i failed
to resolve this conflict when resolving the merge confliction.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mypy.ini diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.