From 56dc1fbd72066e287bc90599876f8f4e859b23d2 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 12 Aug 2020 17:41:10 +0300 Subject: [PATCH] [git-index] rename GitAcceptConflictSideAction file to GitConflictActions GitOrigin-RevId: 29f3fbbc61d66721fa7c4edca0a482fe91a158a7 --- .../{GitAcceptConflictSideAction.kt => GitConflictActions.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/git4idea/src/git4idea/index/actions/{GitAcceptConflictSideAction.kt => GitConflictActions.kt} (100%) diff --git a/plugins/git4idea/src/git4idea/index/actions/GitAcceptConflictSideAction.kt b/plugins/git4idea/src/git4idea/index/actions/GitConflictActions.kt similarity index 100% rename from plugins/git4idea/src/git4idea/index/actions/GitAcceptConflictSideAction.kt rename to plugins/git4idea/src/git4idea/index/actions/GitConflictActions.kt -- 2.23.3