From 612c20e481d3ed47a58277f84f1040fd4f13f82f Mon Sep 17 00:00:00 2001 From: benji7425 Date: Sun, 22 Jan 2017 18:56:19 +0000 Subject: [PATCH] git subrepo pull --remote=git@github.com:benji7425/discord-feed-bot.wiki.git docs subrepo: subdir: "docs" merged: "f70e48b" upstream: origin: "git@github.com:benji7425/discord-feed-bot.wiki.git" branch: "master" commit: "f70e48b" git-subrepo: version: "0.3.1" origin: "???" commit: "???" --- docs/.gitrepo | 6 +++--- docs/user/installation.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/.gitrepo b/docs/.gitrepo index 2c867c7..fb2ce99 100644 --- a/docs/.gitrepo +++ b/docs/.gitrepo @@ -4,8 +4,8 @@ ; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; [subrepo] - remote = https://github.com/benji7425/discord-feed-bot.wiki.git + remote = git@github.com:benji7425/discord-feed-bot.wiki.git branch = master - commit = 8e3da371ddf5c1835a9c32eca4209d00c6f17148 - parent = ee7648bc810dc8b1efb38d59aae489269d8a3246 + commit = f70e48b91074ad051eec48679d013409a79ed53e + parent = 21bc8bdaeb42f8eca6218fbe1910ddcc75d56c3c cmdver = 0.3.1 diff --git a/docs/user/installation.md b/docs/user/installation.md index 45f45cb..52ffa85 100644 --- a/docs/user/installation.md +++ b/docs/user/installation.md @@ -4,7 +4,7 @@ 2. Download the zip from [releases](https://github.com/benji7425/discord-feed-bot/releases) and extract 3. Open a terminal in extracted folder 4. Run `npm install` and wait for it to finish -5. Edit *config.json* to include your RSS feed and channel ID (see configuration page for more info) +5. Edit *config.json* to include your server/channel details (see configuration page for more info) 6. Create *bot-config.json* to include your bot token: `{ "token": "abc123blahblahblahyourtokengoeshere"