Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
# Conflicts (resolved):
#	docs/cancellation-and-timeouts.md
  • Loading branch information
hltj committed May 7, 2019
2 parents a88a700 + 8003932 commit fe7afdf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion coroutines-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The main coroutines guide has moved to the [docs folder](docs/coroutines-guide.m
* <a name='cancelling-coroutine-execution'></a>[Cancelling coroutine execution](docs/cancellation-and-timeouts.md#cancelling-coroutine-execution)
* <a name='cancellation-is-cooperative'></a>[Cancellation is cooperative](docs/cancellation-and-timeouts.md#cancellation-is-cooperative)
* <a name='making-computation-code-cancellable'></a>[Making computation code cancellable](docs/cancellation-and-timeouts.md#making-computation-code-cancellable)
* <a name='closing-resources-with-`finally`'></a>[Closing resources with `finally`](docs/cancellation-and-timeouts.md#closing-resources-with-`finally`)
* <a name='closing-resources-with-finally'></a>[Closing resources with `finally`](docs/cancellation-and-timeouts.md#closing-resources-with-finally)
* <a name='run-non-cancellable-block'></a>[Run non-cancellable block](docs/cancellation-and-timeouts.md#run-non-cancellable-block)
* <a name='timeout'></a>[Timeout](docs/cancellation-and-timeouts.md#timeout)
<!--- TOC_REF docs/composing-suspending-functions.md -->
Expand Down
1 change: 1 addition & 0 deletions knit/src/Knit.kt
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ fun makeSectionRef(name: String): String = name
.replace(",", "")
.replace("(", "")
.replace(")", "")
.replace("`", "")
.toLowerCase()

class Include(val regex: Regex, val lines: MutableList<String> = arrayListOf())
Expand Down

0 comments on commit fe7afdf

Please sign in to comment.