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

Fix #3464: Merge coming_soon_topic_view into single xml file #3713

Merged

Conversation

jashasweejena
Copy link
Contributor

Explanation

Fixes #3464: Multiple versions of file coming_soon_topic_view.xml were having exactly the same content. Hence, removed the duplicate instances of the file.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@rt4914 rt4914 self-assigned this Aug 23, 2021
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.

Apologies for the delay. Merging this now. Thanks @jashasweejena

@rt4914
Copy link
Contributor

rt4914 commented Aug 30, 2021

@jashasweejena Two things:

  1. Merge with latest develop
  2. Press Control + Alt + L - reformatting shortcut to fix the formatting in layout/coming_soon_topic_view

@rt4914 rt4914 closed this Aug 30, 2021
@rt4914 rt4914 reopened this Aug 30, 2021
@rt4914 rt4914 assigned jashasweejena and unassigned rt4914 Aug 30, 2021
@oppiabot oppiabot bot added the PR: LGTM label Aug 30, 2021
@jashasweejena
Copy link
Contributor Author

I apologize for the delay caused. Fixed the pointed-out things pushed them :)

@jashasweejena Two things:

1. Merge with latest develop

2. Press `Control + Alt + L` - reformatting shortcut to fix the formatting in `layout/coming_soon_topic_view`

@rt4914 rt4914 assigned rt4914 and unassigned jashasweejena Sep 7, 2021
@rt4914 rt4914 merged commit 33bc789 into oppia:develop Sep 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge coming_soon_topic_view into single xml file
2 participants