From cfbb3972ff5dbd6773ae7bd536407c0e08a6fb0c Mon Sep 17 00:00:00 2001
From: Jonathan Guinet <jonathan.guinet@c-s.fr>
Date: Wed, 12 Jul 2017 13:32:34 -0400
Subject: [PATCH] [MRG] merge problem in rugged messages
---
src/main/java/org/orekit/rugged/errors/RuggedMessages.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
index 46310939..46e8b6a4 100644
--- a/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
+++ b/src/main/java/org/orekit/rugged/errors/RuggedMessages.java
@@ -81,7 +81,7 @@ public enum RuggedMessages implements Localizable {
NO_REFERENCE_MAPPINGS("no reference mappings for parameters estimation"),
DUPLICATED_PARAMETER_NAME("a different parameter with name {0} already exists"),
INVALID_RUGGED_NAME("invalid rugged name."),
- UNSUPPORTED_REFINING_CONTEXT("refining using {0} rugged instance is not handled.");
+ UNSUPPORTED_REFINING_CONTEXT("refining using {0} rugged instance is not handled."),
NO_LAYER_DATA("no atmospheric layer data at altitude {0} (lowest altitude: {1})");
// CHECKSTYLE: resume JavadocVariable check
--
GitLab