Skip to content
This repository has been archived by the owner on Oct 11, 2020. It is now read-only.

Fixed URL locations for the user interfaces #548

Closed
wants to merge 1 commit into from

Conversation

aschaeffer
Copy link
Contributor

No description provided.

@ghost ghost assigned aschaeffer Dec 31, 2017
@ghost ghost added the org:in progress label Dec 31, 2017
@ghost ghost assigned a-teammate Dec 31, 2017
conan remote add inexor https://api.bintray.com/conan/inexorgame/inexor-conan --insert
conan remote add bincrafers https://api.bintray.com/conan/bincrafters/public-conan --insert 3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is exactly what I told you not to do :)

conan remote add inexor https://api.bintray.com/conan/inexorgame/inexor-conan --insert
conan remote add bincrafers https://api.bintray.com/conan/bincrafters/public-conan --insert 3
conan remote add community https://api.bintray.com/conan/conan-community/conan --insert 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove

conan remote add inexor https://api.bintray.com/conan/inexorgame/inexor-conan --insert
conan remote add bincrafers https://api.bintray.com/conan/bincrafters/public-conan --insert 3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove

conan remote add inexor https://api.bintray.com/conan/inexorgame/inexor-conan --insert
conan remote add bincrafers https://api.bintray.com/conan/bincrafters/public-conan --insert 3
conan remote add community https://api.bintray.com/conan/conan-community/conan --insert 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove

@Croydon
Copy link
Contributor

Croydon commented Dec 31, 2017

I guess it would be easier if you just wait for my work/help to get my branch green, as I'm working on fixing this too :)

@a-teammate
Copy link
Contributor

I guess it would be easier if you just wait for my work/help to get my branch green, as I'm working on fixing this too :)

I disagree.
This will take time which isnt needed.
We have two PRs which are mergable but master is broken because of a bug unrelated to us directly.
So we should merge the two PRs and fix it up when your PR is ready :)

Btw: @aschaeffer could you please retest? :D

@Croydon
Copy link
Contributor

Croydon commented Jan 4, 2018

Master is broken. This is broken. You don't really gain anything from merging this. You want to make merge exceptions for what advantage?

Also if you plan do to this, then you can remove the last two commits again and Hanack doesn't need to retest.

@a-teammate
Copy link
Contributor

For the advantage of having a master branch with the readymade features merged.

The "Hanack plz retest" was meant on the other PR. :)

@a-teammate
Copy link
Contributor

merged

@a-teammate a-teammate closed this Jan 7, 2018
@ghost ghost removed the org:in progress label Jan 7, 2018
@a-teammate a-teammate deleted the aschaeffer/fixui2 branch January 7, 2018 17:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants