From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Thu, 31 Jul 2014 08:45:00 +0000 (+0200)
Subject: Fix a WTF local branch corruption
X-Git-Tag: 0.3a~7
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=031b9fe82c79c1287d968a544ca9810e54d1eb7f;p=anyanka.git

Fix a WTF local branch corruption
---

diff --git a/signal.cpp b/signal.cpp
index f62be9e..6a3be62 100644
--- a/signal.cpp
+++ b/signal.cpp
@@ -38,20 +38,15 @@ const QString Signal::MILLIBARS_SI("mbar");
 const QString Signal::MILLIVOLTS_SI("mV");
 const QString Signal::WATTS_SI("W");
 
-<<<<<<< HEAD
 Signal::Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit,
                const uint16_t wlMsr, const uint16_t wlMsrInt, const uint16_t wlRef, const uint16_t wlRefInt,
                const std::vector<TimeValuePair>& values, QObject* parent) :
-=======
-Signal::Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit, uint16_t wavelengthAbs, uint16_t intervalAbs,
-               uint16_t wavelengthRef, uint16_t intervalRef, const std::vector<TimeValuePair>& values, QObject* parent) :
->>>>>>> 4c21316481208fda42850d889396470de9707deb
   QObject(parent),
   m_equipment(equipment),
   m_resource(resource),
   m_samplingRate(samplingRate),
-  m_spectralIntervalAbs(intervalAbs),
-  m_spectralIntervalRef(intervalRef),
+  m_spectralIntervalAbs(wlMsrInt),
+  m_spectralIntervalRef(wlRefInt),
   m_values(values),
   m_wavelengthMeasured(wlMsr),
   m_wavelengthMeasuredInterval(wlMsrInt),