Skip to content

[FIX] Conflicts not resolved properly on 4.18.0#3290

Merged
diegolmello merged 1 commit into
single-serverfrom
fix.remove-server-list
Jul 22, 2021
Merged

[FIX] Conflicts not resolved properly on 4.18.0#3290
diegolmello merged 1 commit into
single-serverfrom
fix.remove-server-list

Conversation

@AlexAlexandre

Copy link
Copy Markdown
Contributor

Proposed changes

Remove the list of servers from the Rooms list view.

Issue(s)

N/A

How to test or reproduce

Open the app, after login you be able to se an error on the emulator.

Screenshots

Captura de Tela 2021-07-22 às 10 27 48

After the fix:

Captura de Tela 2021-07-22 às 10 39 37

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

@AlexAlexandre AlexAlexandre self-assigned this Jul 22, 2021
@diegolmello diegolmello changed the title [FIX] - remove the list of servers from RoomsListView [FIX] Conflicts not resolved properly on 4.18.0 Jul 22, 2021
@diegolmello diegolmello merged commit 8ee9a8a into single-server Jul 22, 2021
@diegolmello diegolmello deleted the fix.remove-server-list branch July 22, 2021 21:13
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.

2 participants