NIP-26: Delegation #504

Open
v0l wants to merge 1 commits from nip26 into main
v0l commented 2023-04-10 19:20:57 +00:00 (Migrated from github.com)
No description provided.
cloudflare-pages[bot] commented 2023-04-10 19:22:54 +00:00 (Migrated from github.com)

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: db5738c
Status:   Deploy successful!
Preview URL: https://c4f3b572.snort-social.pages.dev
Branch Preview URL: https://nip26.snort-social.pages.dev

View logs

## Deploying with &nbsp;<a href="https://pages.dev"><img alt="Cloudflare Pages" src="https://user-images.githubusercontent.com/23264/106598434-9e719e00-654f-11eb-9e59-6167043cfa01.png" width="16"></a> &nbsp;Cloudflare Pages <table><tr><td><strong>Latest commit:</strong> </td><td> <code>db5738c</code> </td></tr> <tr><td><strong>Status:</strong></td><td>&nbsp;✅&nbsp; Deploy successful!</td></tr> <tr><td><strong>Preview URL:</strong></td><td> <a href='https://c4f3b572.snort-social.pages.dev'>https://c4f3b572.snort-social.pages.dev</a> </td></tr> <tr><td><strong>Branch Preview URL:</strong></td><td> <a href='https://nip26.snort-social.pages.dev'>https://nip26.snort-social.pages.dev</a> </td></tr> </table> [View logs](https://dash.cloudflare.com/?to=/:account/pages/view/snort-social/c4f3b572-6192-4102-af47-8dc705ad3b44)
This pull request has changes conflicting with the target branch.
  • packages/app/src/Pages/SettingsPage.tsx
  • packages/app/src/Pages/settings/Index.tsx
  • packages/app/src/State/Login.ts
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b nip26 main
git pull origin nip26

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff nip26
git push origin main
Sign in to join this conversation.
No description provided.