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.

Sign up for GitHub

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

README: Resolve conflicts #110

Merged
merged 1 commit into from
Apr 17, 2024
Merged

README: Resolve conflicts #110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 24 additions & 57 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,75 +219,42 @@ NIPsは、**Nostr Implementation Possibilities**の略称である。
| `l` | ラベル, ラベル名前空間 | annotations | [32](32.md) |
| `L` | ラベル名前空間 | -- | [32](32.md) |
| `m` | MIME type | -- | [94](94.md) |
<<<<<<< HEAD
| `r` | 参照 (URL, etc) | petname | |
| `q` | イベントID (hex) | relay URL | [18](18.md) |
| `r` | 参照 (URL, etc) | petname | |
| `r` | リレーURL | marker | [65](65.md) |
| `t` | ハッシュタグ | -- | |
| `alt` | 概要 | -- | [31](31.md) |
| `amount` | 文字列化されたミリサトシ | -- | [57](57.md) |
| `bolt11` | `bolt11` インボイス | -- | [57](57.md) |
| `challenge` | チャレンジ文字列 | -- | [42](42.md) |
| `client` | 名前, アドレス | relay URL | [89](89.md) |
| `content-warning` | 理由 | -- | [36](36.md) |
| `delegation` | 公開鍵, 条件, 委任トークン | -- | [26](26.md) |
| `description` | インボイス/バッジの説明 | -- | [57](57.md), [58](58.md) |
| `emoji` | ショートコード, 画像 URL | -- | [30](30.md) |
=======
| `q` | event id (hex) | relay URL | [18](18.md) |
| `r` | a reference (URL, etc) | petname | |
| `r` | relay url | marker | [65](65.md) |
| `t` | hashtag | -- | |
| `alt` | summary | -- | [31](31.md) |
| `amount` | millisatoshis, stringified | -- | [57](57.md) |
| `t` | ハッシュタグ | -- | |
| `alt` | 概要 | -- | [31](31.md) |
| `amount` | 文字列化されたミリサトシ | -- | [57](57.md) |
| `bolt11` | `bolt11` invoice | -- | [57](57.md) |
| `challenge` | challenge string | -- | [42](42.md) |
| `client` | name, address | relay URL | [89](89.md) |
| `challenge` | チャレンジ文字列 | -- | [42](42.md) |
| `client` | 名前, アドレス | relay URL | [89](89.md) |
| `clone` | git clone URL | -- | [34](34.md) |
| `content-warning` | reason | -- | [36](36.md) |
| `delegation` | pubkey, conditions, delegation token | -- | [26](26.md) |
| `description` | description | -- | [34](34.md), [57](57.md), [58](58.md) |
| `emoji` | shortcode, image URL | -- | [30](30.md) |
>>>>>>> upstream/master
| `content-warning` | 理由 | -- | [36](36.md) |
| `delegation` | 公開鍵, 条件, 委任トークン | -- | [26](26.md) |
| `description` | インボイス/バッジの説明 | -- | [34](34.md), [57](57.md), [58](58.md) |
| `emoji` | ショートコード, 画像 URL | -- | [30](30.md) |
| `encrypted` | -- | -- | [90](90.md) |
| `expiration` | unix timestamp (string) | -- | [40](40.md) |
| `goal` | イベントID (hex) | relay URL | [75](75.md) |
| `image` | 画像URL 　 | dimensions in pixels | [23](23.md), [58](58.md) |
| `imeta` | インラインメタデータ | -- | [92](92.md) |
| `lnurl` | `bech32` encoded `lnurl` | -- | [57](57.md) |
<<<<<<< HEAD
| `location` | 場所文字列 | -- | [52](52.md), [99](99.md) |
| `name` | バッジの名前 | -- | [58](58.md) |
| `nonce` | 乱数 | -- | [13](13.md) |
| `preimage` | `bolt11` インボイスのハッシュ | -- | [57](57.md) |
| `price` | 値段 | currency, frequency | [99](99.md) |
| `proxy` | 外部ID | protocol | [48](48.md) |
| `location` | 場所文字列 | -- | [52](52.md), [99](99.md) |
| `name` | 名前 | -- | [34](34.md), [58](58.md) |
| `nonce` | 乱数 | -- | [13](13.md) |
| `preimage` | `bolt11` インボイスのハッシュ | -- | [57](57.md) |
| `price` | 値段 | currency, frequency | [99](99.md) |
| `proxy` | 外部ID | protocol | [48](48.md) |
| `published_at` | unix timestamp (string) | -- | [23](23.md) |
| `relay` | リレーURL | -- | [42](42.md) |
| `relays` | リレーリスト | -- | [57](57.md) |
| `server` | ファイルストレージサーバーURL | -- | [96](96.md) |
| `subject` | 件名 | -- | [14](14.md) |
| `summary` | 記事の要約 | -- | [23](23.md) |
| `thumb` | バッジサムネイル | dimensions in pixels | [58](58.md) |
| `title` | 記事のタイトル | -- | [23](23.md) |
| `zap` | 公開鍵 (hex), リレー URL | weight | [57](57.md) |
=======
| `location` | location string | -- | [52](52.md), [99](99.md) |
| `name` | name | -- | [34](34.md), [58](58.md) |
| `nonce` | random | -- | [13](13.md) |
| `preimage` | hash of `bolt11` invoice | -- | [57](57.md) |
| `price` | price | currency, frequency | [99](99.md) |
| `proxy` | external ID | protocol | [48](48.md) |
| `published_at` | unix timestamp (string) | -- | [23](23.md) |
| `relay` | relay url | -- | [42](42.md) |
| `relays` | relay list | -- | [57](57.md) |
| `server` | file storage server url | -- | [96](96.md) |
| `subject` | subject | -- | [14](14.md) |
| `summary` | article summary | -- | [23](23.md) |
| `thumb` | badge thumbnail | dimensions in pixels | [58](58.md) |
| `title` | article title | -- | [23](23.md) |
| `relays` | リレーリスト | -- | [57](57.md) |
| `server` | ファイルストレージサーバーURL | -- | [96](96.md) |
| `subject` | 件名 | -- | [14](14.md) |
| `summary` | 記事の要約 | -- | [23](23.md) |
| `thumb` | バッジサムネイル | dimensions in pixels | [58](58.md) |
| `title` | 記事のタイトル | -- | [23](23.md) |
| `web` | webpage URL | -- | [34](34.md) |
| `zap` | pubkey (hex), relay URL | weight | [57](57.md) |
>>>>>>> upstream/master
| `zap` | 公開鍵 (hex), リレー URL | weight | [57](57.md) |

## NIPsの受け入れ基準

Expand Down