Skip to content
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.

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

gui: Fix comparison operator in expression (ref #3035) #3036

Closed
wants to merge 1 commit into from
Closed

gui: Fix comparison operator in expression (ref #3035) #3036

wants to merge 1 commit into from

Conversation

calmh
Copy link
Member

@calmh calmh commented May 4, 2016

Purpose

Make the GUI not blow up

@calmh
Copy link
Member Author

calmh commented May 4, 2016

@st-review merge whenever dude

@st-review
Copy link

🕐 Build status is pending. I'll wait to see if this becomes successful and then merge!

@AudriusButkevicius
Copy link
Member

@st-review merge

@st-review
Copy link

🕐 Build status is pending. I'll wait to see if this becomes successful and then merge!

@st-review
Copy link

⛔ Merge failed:

Nothing to merge, as far as I can tell.

1 similar comment
@st-review
Copy link

⛔ Merge failed:

Nothing to merge, as far as I can tell.

@calmh
Copy link
Member Author

calmh commented May 4, 2016

Wat

@AudriusButkevicius
Copy link
Member

@st-review merge

@st-review
Copy link

👌 Merged as 5919592. Thanks, @calmh!

st-review pushed a commit that referenced this pull request May 4, 2016
@st-review st-review closed this May 4, 2016
@calmh
Copy link
Member Author

calmh commented May 4, 2016

WAAAT

@calmh
Copy link
Member Author

calmh commented May 4, 2016

Ah

@calmh
Copy link
Member Author

calmh commented May 4, 2016

The two simultaneous merge attempts stomped on each other, one doing "merge" at the same time as the other one doing "reset --hard" and so on. Maybe it shouldn't attempt more than one at the same time for a given repo :)

@calmh calmh deleted the bug3035 branch May 4, 2016 20:33
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jun 16, 2017
@syncthing syncthing locked and limited conversation to collaborators Jun 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants