Skip to content

Commit eacb120

Browse files
markiewbben-gibson
authored andcommitted
Fixing "Conflicting component name 'SaveActionSettings': class uk.co.ben_gibson.repositorymapper.Settings.Settings and class com.dubreuia.model.Storage" (#37)
dubreuia/intellij-plugin-save-actions#70
1 parent 0c957db commit eacb120

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@ All Notable changes to `Open in Git host` will be documented in this file
4343

4444
## 1.6.5 - 2017-03-24
4545

46-
- Removed analytics.
46+
- Removed analytics.
47+
48+
## 1.6.6 - 2017-04-12
49+
50+
- Fixed incompatibility issue with save actions plugin. Note that you have to configure the plugin again!

resources/META-INF/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2">
22
<id>uk.co.ben-gibson.remote.repository.mapper</id>
33
<name>Open in Git host</name>
4-
<version>1.6.5</version>
4+
<version>1.6.6</version>
55
<vendor url="https://github.com/ben-gibson/jetbrains-open-in-git-host">Ben Gibson</vendor>
66

77
<description><![CDATA[
@@ -27,7 +27,7 @@
2727
<change-notes><![CDATA[
2828
<ul>
2929
<li>
30-
Removed analytics.
30+
Fixed incompatibility issue with save actions plugin. Note that you have to configure the plugin again!
3131
</li>
3232
</ul>
3333
]]>

src/uk/co/ben_gibson/repositorymapper/Settings/Settings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.jetbrains.annotations.NotNull;
99
import uk.co.ben_gibson.repositorymapper.Host.Host;
1010

11-
@State(name = "SaveActionSettings",
11+
@State(name = "uk.co.ben_gibson.repositorymapper.Settings",
1212
storages = {@Storage(id = "default", file = StoragePathMacros.PROJECT_CONFIG_DIR + "/settings.xml")}
1313
)
1414

0 commit comments

Comments
 (0)