From 9c7e4871db0ff722fa091c28f4b8a5b23f8864e9 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 24 Nov 2016 16:20:04 +0100
Subject: [PATCH] Fix conflict in recent merges

---
 xs/src/libslic3r/Config.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp
index 00142be87..41923a6a5 100644
--- a/xs/src/libslic3r/Config.hpp
+++ b/xs/src/libslic3r/Config.hpp
@@ -226,7 +226,7 @@ class ConfigOptionString : public ConfigOptionSingle<std::string>
         return escape_string_cstyle(this->value);
     }
 
-    bool deserialize(std::string str) {
+    bool deserialize(std::string str, bool append = false) {
         return unescape_string_cstyle(str, this->value);
     };
 };
@@ -247,7 +247,7 @@ class ConfigOptionStrings : public ConfigOptionVector<std::string>
         return this->values;
     };
     
-    bool deserialize(std::string str) {
+    bool deserialize(std::string str, bool append = false) {
         return unescape_strings_cstyle(str, this->values);
     };
 };
@@ -668,7 +668,7 @@ class ConfigBase
     bool equals(ConfigBase &other);
     t_config_option_keys diff(ConfigBase &other);
     std::string serialize(const t_config_option_key &opt_key) const;
-    bool set_deserialize(const t_config_option_key &opt_key, std::string str);
+    bool set_deserialize(const t_config_option_key &opt_key, std::string str, bool append = false);
     double get_abs_value(const t_config_option_key &opt_key) const;
     double get_abs_value(const t_config_option_key &opt_key, double ratio_over) const;
     void setenv_();