Merge branch 'develop' into feature/OrdiniAcquisto_PV
# Conflicts: # .idea/caches/build_file_checksums.ser # .idea/codeStyles/Project.xml # .idea/dbnavigator.xml # .idea/misc.xml # .idea/modules.xml # .idea/runConfigurations/app.xml
This commit is contained in:
2
.idea/dbnavigator.xml
generated
2
.idea/dbnavigator.xml
generated
@@ -2,7 +2,7 @@
|
||||
<project version="4">
|
||||
<component name="DBNavigator.Project.DataEditorManager">
|
||||
<record-view-column-sorting-type value="BY_INDEX" />
|
||||
<value-preview-text-wrapping value="true" />
|
||||
<value-preview-text-wrapping value="false" />
|
||||
<value-preview-pinned value="false" />
|
||||
</component>
|
||||
<component name="DBNavigator.Project.DataExportManager">
|
||||
|
||||
Reference in New Issue
Block a user