2021-12-08 16:11:58 +00:00
|
|
|
# Default ignored files
|
|
|
|
|
/shelf/
|
|
|
|
|
/workspace.xml
|
2021-12-13 11:33:31 +00:00
|
|
|
<<<<<<< HEAD
|
2021-12-08 16:11:58 +00:00
|
|
|
# Editor-based HTTP Client requests
|
|
|
|
|
/httpRequests/
|
|
|
|
|
# Datasource local storage ignored files
|
|
|
|
|
/dataSources/
|
|
|
|
|
/dataSources.local.xml
|
2021-12-13 11:33:31 +00:00
|
|
|
=======
|
|
|
|
|
>>>>>>> 6aab769d68a38febc5aab3691296993cf7462d11
|
