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(PRofileShowcase): Fixing conflict merge error #14242

Merged
merged 1 commit into from
Apr 2, 2024

Conversation

alexjba
Copy link
Contributor

@alexjba alexjba commented Apr 2, 2024

What does the PR do

Profile showcase for a contact just got broken after conflict resolution. This is fixing showcase for a contact and removing unwanted log

@status-im-auto
Copy link
Member

status-im-auto commented Apr 2, 2024

Jenkins Builds

Commit #️⃣ Finished (UTC) Duration Platform Result
✔️ 407f6d1 #1 2024-04-02 07:55:40 ~6 min tests/nim 📄log
✔️ 407f6d1 #1 2024-04-02 07:56:23 ~7 min macos/aarch64 🍎dmg
✔️ 407f6d1 #1 2024-04-02 08:00:10 ~10 min tests/ui 📄log
✔️ 407f6d1 #1 2024-04-02 08:04:56 ~15 min macos/x86_64 🍎dmg
✔️ 407f6d1 #1 2024-04-02 08:07:15 ~18 min linux/x86_64 📦tgz
✔️ 407f6d1 #1 2024-04-02 08:20:49 ~31 min windows/x86_64 💿exe

Copy link
Contributor

@noeliaSD noeliaSD left a comment

Choose a reason for hiding this comment

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

Tested! LGTM!

@alexjba alexjba merged commit 684fb78 into master Apr 2, 2024
8 checks passed
@alexjba alexjba deleted the feat/add-perspective-combo-box-merge branch April 2, 2024 09:07
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.

4 participants