Skip to content

Commit 4bb29d9

Browse files
authored
Merge pull request #147 from basiljs/chore/update-api
feat(linked -textframes): adds docs for `textFrames` and `linkedTextFrames`
2 parents becc835 + ca3265b commit 4bb29d9

15 files changed

+3105
-935
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
test/report.txt
3+
.vscode
34

45
# File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
56

.vscode/settings.json

-26
This file was deleted.

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ cd basiljs.github.io
1818
# get all branches
1919
git fetch -a
2020
# get into the develop branch
21+
# this is currently the one that serves the page
22+
# your pull request should also be against develop not master (at the moment)
2123
git checkout -b develop origin/develop
2224
# now make your new branch based on develop
2325
git checkout -b chore/update-docs
@@ -40,6 +42,7 @@ git commit -m "chore: Update Basil.js api to latest state [Add your favorite emo
4042
# push current HEAD to remote
4143
git push -u origin HEAD
4244
# Now go to the GitHub UI and create your PR
45+
# Against the develop branch (not master).
4346
```
4447

4548
## Development

0 commit comments

Comments
 (0)