<<<<<<< HEAD
# Default ignored files
/shelf/
/workspace.xml

# Rider ignored files
/.idea.AwesomeRunner.iml
/modules.xml
/contentModel.xml
/projectSettingsUpdater.xml

# Editor-based HTTP Client requests
/httpRequests/

# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

=======
﻿# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/contentModel.xml
/projectSettingsUpdater.xml
/.idea.AwesomeRunner.iml
/modules.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200
