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.

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

Jump to bottom

Fix #3577 : Merged story_header_view.xml into single xml file. #3873

Merged
merged 2 commits into from
Oct 3, 2021
Merged

Fix #3577 : Merged story_header_view.xml into single xml file. #3873

merged 2 commits into from
Oct 3, 2021

Conversation

ayush0402
Copy link
Contributor

Explanation

Fixes #3577

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

@ayush0402 ayush0402 requested a review from rt4914 as a code owner October 3, 2021 19:28
@ayush0402
Copy link
Contributor Author

@rt4914 PTAL.

rt4914
rt4914 approved these changes Oct 3, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@rt4914 rt4914 enabled auto-merge (squash) October 3, 2021 19:54
@oppiabot oppiabot bot unassigned rt4914 Oct 3, 2021
@oppiabot
Copy link

oppiabot bot commented Oct 3, 2021

Unassigning @rt4914 since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Oct 3, 2021
@ayush0402
Merge branch 'develop' of github.com:oppia/oppia-android into merging…
27b5652 
…_xmls

� Conflicts:
�	app/src/main/res/values-land/dimens.xml
�	app/src/main/res/values/dimens.xml
@rt4914 rt4914 merged commit 8677063 into oppia:develop Oct 3, 2021
@ayush0402 ayush0402 deleted the merging_xmls branch October 7, 2021 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

Assignees
No one assigned
Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge story_header_view.xml into single xml file
2 participants
@ayush0402 @rt4914