junos
/
rapids
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update git flow docs, set keyboard flag to false

pull/108/head
JulioV 2020-12-20 13:51:18 -05:00
parent ac4526df5d
commit d39b700b5f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -193,7 +193,7 @@ PHONE_KEYBOARD:
TABLE: keyboard TABLE: keyboard
PROVIDERS: PROVIDERS:
RAPIDS: RAPIDS:
COMPUTE: True COMPUTE: False
FEATURES: [] FEATURES: []
SRC_FOLDER: "rapids" # inside src/features/phone_keyboard SRC_FOLDER: "rapids" # inside src/features/phone_keyboard
SRC_LANGUAGE: "python" SRC_LANGUAGE: "python"

2
docs/developers/git-flow.md
View File

@ -30,7 +30,7 @@ git commit -m "Add my new feature" # use a concise description
```bash ```bash
git checkout feature/feature1 git checkout feature/feature1
git pull origin develop git fetch origin develop
git rebase -i develop git rebase -i develop
git checkout develop git checkout develop
git merge --no-ff feature/feature1 # (use the default merge message) git merge --no-ff feature/feature1 # (use the default merge message)