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
3636
3737 //QString authCode;
3838
39−
4039 };
4140
4241 #endif // hifi_GooglePolyScriptingInterface_h

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t