Skip to content

Fix hardcoded dimensions #3282

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

Closed
wants to merge 6 commits into from
Closed

Fix hardcoded dimensions #3282

wants to merge 6 commits into from

Conversation

alcarazzam
Copy link
Contributor

Fix hardcoded dimensions

Fixes #3197 The xml files contain a lot of hardcoded dimensions

Tests performed
Gradle build successfully.

Copy link

@tests-checker tests-checker bot left a comment

Choose a reason for hiding this comment

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

Could you please add tests to make sure this change works as expected?

@alcarazzam
Copy link
Contributor Author

Why there are conflicts with java files if I have not changed that files? Thanks

Copy link
Contributor

@yashk2000 yashk2000 left a comment

Choose a reason for hiding this comment

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

This pr seems to contain extra changes. The only changes needed here are in the resource files. I see that some java files have also been edited. Please look into this.

@nicolas-raoul
Copy link
Member

I guess there are conflicts because of a recent refactoring?
Please rebase from master, I believe that should fix the problem :-)

@alcarazzam
Copy link
Contributor Author

How I rebase from master? Git says that my branches are updated.

@yashk2000
Copy link
Contributor

yashk2000 commented Dec 7, 2019

First fetch upstream.
Then try: git rebase -i origin/master

@alcarazzam
Copy link
Contributor Author

Thanks @yashk2000:

First fetch upstream.
Then try: git rebase -i origin/master

Sorry, these git operations are a bit difficult for me. I don't know what I'm doing, but somehow I've pushed two more commit with "yesterday" as date 😕. Help needed!

@alcarazzam
Copy link
Contributor Author

Please ignore this PR, I'm going to open another to try to solve the problems.

@alcarazzam alcarazzam closed this Dec 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The xml files contain a lot of hardcoded dimensions
3 participants