ref #9878 restoring media type source citations by making use of tagged text cropping

[cdm-vaadin.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 3e9cc040080f038856a0669dfc6a9f9b5d237398..20171987ff74515330b74f22fe220f10b3e75762 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,12 @@
 * text=auto !eol
+pom.xml merge=ours
 ide/eclipse/cdm-vaadin.launch -text
 /pom.xml -text
 src/main/java/eu/etaxonomy/cdm/vaadin/AppWidgetSet.gwt.xml -text
 src/main/java/eu/etaxonomy/cdm/vaadin/CdmAppInitializer.java.bkp -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/ConceptRelationshipComposite.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/ConfigWindow.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/component/DetailWindow.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/EditConceptRelationshipComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/HorizontalToolbar.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/component/NewTaxonBaseComposite.java -text
@@ -27,8 +30,9 @@ src/main/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenter.jav
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenter.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionSelectionPresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/DistributionTablePresenter.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/presenter/distributionStatus/settings/SettingsPresenter.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/servlet/CdmVaadinConversationalServlet.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmChangeEvent.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/session/CdmDataChangeService.java -text
@@ -41,7 +45,7 @@ src/main/java/eu/etaxonomy/cdm/vaadin/ui/AbstractAuthenticatedUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CdmBaseUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/CheckUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/ConceptRelationshipUI.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/ui/DbStatusUI.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/ui/DistributionStatusUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/ui/StatusEditorUI.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmSQLStringDecorator.java -text
@@ -56,10 +60,10 @@ src/main/java/eu/etaxonomy/cdm/vaadin/view/IConceptRelationshipComponentListener
 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComponentListener.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/INewTaxonBaseComposite.java -text
 src/main/java/eu/etaxonomy/cdm/vaadin/view/IStatusComposite.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionSelectionView.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/DistributionTableView.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/IDistributionSelectionComponent.java -text
-src/main/java/eu/etaxonomy/cdm/vaadin/view/dbstatus/IDistributionTableComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionSelectionView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/DistributionTableView.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionSelectionComponent.java -text
+src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/IDistributionTableComponent.java -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/css/d3.conceptrelationshiptree.css -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/extlib/d3.min.js -text
 src/main/resources/eu/etaxonomy/cdm/vaadin/jscomponent/lib/d3.conceptrelationshiptree_connector.js -text
@@ -114,6 +118,7 @@ src/main/webapp/VAADIN/themes/macosx/icons/32/note.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/ok.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/reload.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/settings.png -text
+src/main/webapp/VAADIN/themes/macosx/icons/32/settings_1.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/top-left.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/top-right.png -text
 src/main/webapp/VAADIN/themes/macosx/icons/32/trash-full.png -text