.gitignore

.DS_Store
.idea/
assets/dist/.DS_Store
map_widget/berlin_map_2.sketch
<<<<<<< HEAD
bower_components/bootstrap/less/bootstrap.css
bower_components/bootstrap/less/media.css
bower_components/bootstrap/less/mixins.css
bower_components/bootstrap/less/mixins/alerts.css
bower_components/bootstrap/less/mixins/background-variant.css
bower_components/bootstrap/less/mixins/border-radius.css
bower_components/bootstrap/less/mixins/buttons.css
bower_components/bootstrap/less/mixins/center-block.css
bower_components/bootstrap/less/mixins/clearfix.css
bower_components/bootstrap/less/mixins/forms.css
bower_components/bootstrap/less/mixins/gradients.css
bower_components/bootstrap/less/mixins/grid-framework.css
bower_components/bootstrap/less/mixins/grid.css
bower_components/bootstrap/less/mixins/hide-text.css
bower_components/bootstrap/less/mixins/image.css
bower_components/bootstrap/less/mixins/labels.css
bower_components/bootstrap/less/mixins/list-group.css
bower_components/bootstrap/less/mixins/nav-divider.css
bower_components/bootstrap/less/mixins/nav-vertical-align.css
bower_components/bootstrap/less/mixins/opacity.css
bower_components/bootstrap/less/mixins/pagination.css
bower_components/bootstrap/less/mixins/panels.css
bower_components/bootstrap/less/mixins/progress-bar.css
bower_components/bootstrap/less/mixins/reset-filter.css
bower_components/bootstrap/less/mixins/resize.css
bower_components/bootstrap/less/mixins/responsive-visibility.css
bower_components/bootstrap/less/mixins/size.css
bower_components/bootstrap/less/mixins/tab-focus.css
bower_components/bootstrap/less/mixins/table-row.css
bower_components/bootstrap/less/mixins/text-emphasis.css
bower_components/bootstrap/less/mixins/text-overflow.css
bower_components/bootstrap/less/mixins/vendor-prefixes.css
bower_components/bootstrap/less/normalize.css
bower_components/bootstrap/less/print.css
bower_components/bootstrap/less/responsive-embed.css
bower_components/bootstrap/less/theme.css
bower_components/bootstrap/less/variables.css
geographicalgranularity_widget/geographicalgranularity.css
result_widget/result.css
map_widget/map.css
lastmodification_widget/lastmodification.css
icons.css
geographicalgranularity_widget/geographicalgranularity.css.map
=======
result_widget/result.css
lastmodification_widget/lastmodification.css
icons.css
>>>>>>> feature/map
date_widget/date.css
category_widget/category.css
globalreset_widget/globalreset.css