summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2c30cc2)
raw | patch | inline | side by side (parent: 2c30cc2)
author | dgerlach <d-gerlach@ti.com> | |
Thu, 20 Sep 2012 18:21:36 +0000 (13:21 -0500) | ||
committer | dgerlach <d-gerlach@ti.com> | |
Thu, 20 Sep 2012 18:21:36 +0000 (13:21 -0500) |
ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp | patch | blob | history |
diff --git a/ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp b/ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp
index d9d657ba0406375bfac2a96a6e308ae33b73db51..f27b16cb564413c0c54359be6596df4e24e6aac1 100644 (file)
@@ -174,14 +174,6 @@ void OpenWeatherMapDataEngine::parseJSONWeatherData(QString *jsonData, WeatherDa
weatherData->setCurrentTemp(temp);
weatherData->setLocalTime(localTime);
weatherData->setIcon(icon);
-<<<<<<< HEAD
-=======
-
- qDebug() << "CUYRRENT";
- qDebug() << temp;
- qDebug() << localTime.toString();
- qDebug() << icon;
->>>>>>> 17637cf2fd8a8feaa930ac27589f0ed9a6d40b5f
}
void OpenWeatherMapDataEngine::parseJSONForecastData(QString *jsonData, WeatherData* weatherData)