This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 20f4732305665266a416a36057f350c3107ba1c8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 10:44:48 2016 +0200 Do no change import/export model --- .../importdata/csv/VoyageCommonsTransectImportExportModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java index d546994..a78cbde 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java @@ -46,7 +46,11 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newMandatoryColumn(Transect.PROPERTY_TITLE); model.newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newMandatoryColumn(Transect.PROPERTY_STRATUM); +<<<<<<< 90f1d7b89c449fafde7d2c70695ebf7da61c2e17 model.newMandatoryColumn(Transect.PROPERTY_COMMENT); +======= + model.newMandatoryColumn("comment", Transect.PROPERTY_COMMENTS); +>>>>>>> Do no change import/export model model.newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); @@ -69,7 +73,11 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newColumnForExport(Transect.PROPERTY_TITLE); model.newColumnForExport(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newColumnForExport(Transect.PROPERTY_STRATUM); +<<<<<<< 90f1d7b89c449fafde7d2c70695ebf7da61c2e17 model.newColumnForExport(Transect.PROPERTY_COMMENT); +======= + model.newColumnForExport("comment", Transect.PROPERTY_COMMENTS); +>>>>>>> Do no change import/export model model.newColumnForExport(Transect.PROPERTY_DATE_CREATED, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newColumnForExport(Transect.PROPERTY_TIME_COVERAGE_START, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newColumnForExport(Transect.PROPERTY_TIME_COVERAGE_END, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.