From 8764139a63e33aecef5fe58639ec8778afa223ec Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 18 Aug 2020 21:08:03 +0300 Subject: [PATCH] [git-index] fix incorrect package declaration GitOrigin-RevId: 2192b408046f00ef4c7e4a547be9bd9f20a8683a --- plugins/git4idea/resources/META-INF/plugin.xml | 2 +- .../src/git4idea/index/GitStageLineStatusTrackerProvider.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml index a022cf0cca91..2c3f5795c747 100644 --- a/plugins/git4idea/resources/META-INF/plugin.xml +++ b/plugins/git4idea/resources/META-INF/plugin.xml @@ -502,7 +502,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/index/GitStageLineStatusTrackerProvider.kt b/plugins/git4idea/src/git4idea/index/GitStageLineStatusTrackerProvider.kt index 778593779e73..2af8e0b25923 100644 --- a/plugins/git4idea/src/git4idea/index/GitStageLineStatusTrackerProvider.kt +++ b/plugins/git4idea/src/git4idea/index/GitStageLineStatusTrackerProvider.kt @@ -1,5 +1,5 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package git4idea.index.lst +package git4idea.index import com.intellij.diff.DiffContentFactoryImpl import com.intellij.openapi.application.runReadAction @@ -19,7 +19,6 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.vcsUtil.VcsFileUtil import com.intellij.vcsUtil.VcsUtil import git4idea.GitUtil -import git4idea.index.* import git4idea.index.vfs.GitIndexVirtualFileCache import git4idea.repo.GitRepositoryManager import git4idea.util.GitFileUtils