History

resolved merge conflict again

Elisa Lupin-Jimenez committed 8 years ago

Commit 264f3622 parents e49181c 50ecb352 files · +3 −8Browse files

Showing the changes to interface/src/scripting/GooglePolyScriptingInterface.h (1 of 2 files). Show all

Unified · Split

interface/src/scripting/GooglePolyScriptingInterface.h+0−1
@@ -36,7 +36,6 @@ private: · 35 unmodified lines
36 36
37 //QString authCode;37 //QString authCode;
38 38
39
40};39};
41 40
42#endif // hifi_GooglePolyScriptingInterface_h41#endif // hifi_GooglePolyScriptingInterface_h