fix merge bug

jirmjos · Jan 23, 2017 · 4a252fc · 4a252fc
1 parent dc14a58
commit 4a252fc
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/libwb/WBDevice.h b/libwb/WBDevice.h
@@ -65,15 +65,10 @@ class LIBWB_API CWBDevice
 #ifdef USE_CONFIG
 	void Init(CConfigItem config);
 #endif	
-<<<<<<< HEAD
-	void AddControl(string Name, CWBControl::ControlType Type, bool ReadOnly, string Source="", string SourceType="");
-	bool sourceExists(string source);
 	bool controlExists(string source);
-=======
 	void addControl(const string &Name);
 	void addControl(const string &Name, CWBControl::ControlType Type, bool ReadOnly, const string &Source="", const string &SourceType="");
 	bool sourceExists(const string &source);
->>>>>>> da8dec94369ab4ba1a7de7f903ce64189d735f3a
 	void setBySource(string source, string sourceType, string Value);
 	void set(string Name, string Value);
 	void set(string Name, float Value);