highperfocused/nips
1
0
Fork 0
mirror of https://github.com/nostr-protocol/nips.git synced 2025-04-02 09:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix conflict

Browse Source
This commit is contained in:
Ricardo Arturo Cabral Mejía 2023-02-22 18:42:31 -05:00
parent 163786b011
commit 9f1663290d
No known key found for this signature in database
GPG Key ID: 5931EBF43A650245
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@ -92,7 +92,6 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
## Standardized Tags
<<<<<<< HEAD
| name | value | other parameters | NIP |
| ---------- | ----------------------- | ----------------- | ------------------------ |
| e | event id (hex) | relay URL, marker | [1](01.md), [10](10.md) |
@ -105,20 +104,6 @@ When experimenting with kinds, keep in mind the classification introduced by [NI
| subject | subject | | [14](14.md) |
| d | identifier | | [33](33.md) |
| expiration | unix timestamp (string) | | [40](40.md) |
=======
| name | value | other parameters | NIP |
| ---------- | -------------------------- | ----------------- | ------------------------ |
| e | event id (hex) | relay URL, marker | [1](01.md), [10](10.md) |
| p | pubkey (hex) | relay URL | [1](01.md) |
| r | a reference (URL, etc) | | [12](12.md) |
| t | hashtag | | [12](12.md) |
| a | kind, pubkey, d-identifier | | [33](33.md) |
| g | geohash | | [12](12.md) |
| nonce | random | | [13](13.md) |
| subject | subject | | [14](14.md) |
| d | identifier | | [33](33.md) |
| expiration | unix timestamp (string) | | [40](40.md) |
>>>>>>> 8fc286a (docs: add badge definition event)
## Criteria for acceptance of NIPs