History

fixed weird merge conflicts

Elisa Lupin-Jimenez committed 8 years ago

Commit 66b6be12 parents 4ed6896 7bb44f41 file · +2 −1Browse files

Showing the changes to interface/src/scripting/GooglePolyScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/scripting/GooglePolyScriptingInterface.cpp+2−1
@@ -193,4 +193,5 @@ or this :(( http://blog.mathieu-leplatre.info/access-a-json-webservice-with-qt-c · 192 unmodified lines
193193 qCDebug(scriptengine) << "first item: " << firstItem;
194194 }
195195
196−*/
196+*/
197+