Skip to content

Stefy fixes #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 29, 2018
Merged

Stefy fixes #10

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167c633
some fixes
Jun 29, 2018
12bd9b6
fixed conflict
Jun 29, 2018
377cbaf
fixed conflict
Jun 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed conflict
  • Loading branch information
Stefania committed Jun 29, 2018
commit 12bd9b64ea5930898fead7bcd65d103d2dd5ffe1
4 changes: 4 additions & 0 deletions src/socket-daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,14 @@ export default class SocketDaemon {
if (r.response.url.indexOf(PROTOCOL.HTTPS) === 0) {
this.selectedProtocol = PROTOCOL.HTTPS;
}
<<<<<<< HEAD
else {
// Protocol http, force 127.0.0.1 for old agent versions too
this.agentInfo[this.selectedProtocol] = this.agentInfo[this.selectedProtocol].replace('localhost', '127.0.0.1');
}
=======
this.readerWriter.initPluginUrl(this.agentInfo[this.selectedProtocol]);
>>>>>>> 93943b354033c52810ae98200bee481ba5eef5d9
return true;
}
return false;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.