PY-2018.1 <aharrison-fuller@macbook-pro Merge branch 'master'

Conflicts:
	find.xml
This commit is contained in:
Adam Harrison-Fuller
2018-05-17 21:56:19 +01:00
+1 -1
View File
@@ -1,6 +1,6 @@
<application> <application>
<component name="Perl5ApplicationSettings"> <component name="Perl5ApplicationSettings">
<option name="pluginVersion" value="2017.4.1" /> <option name="pluginVersion" value="2017.5.1" />
<option name="popupShown" value="true" /> <option name="popupShown" value="true" />
</component> </component>
</application> </application>