Behron
60aaea751f
More merge conflicts. Taking main changes then will integrate mine.
14 lines
283 B
Plaintext
14 lines
283 B
Plaintext
# Default ignored files
|
|
/shelf/
|
|
/workspace.xml
|
|
# Rider ignored files
|
|
/modules.xml
|
|
/projectSettingsUpdater.xml
|
|
/.idea.Luckyrobots.iml
|
|
/contentModel.xml
|
|
# Editor-based HTTP Client requests
|
|
/httpRequests/
|
|
# Datasource local storage ignored files
|
|
/dataSources/
|
|
/dataSources.local.xml
|