Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Usually doing something like; ```bash git pull --rebase -X theirs origin master ``` ... is fine, but this time Git lost the plot in a few places. Fortunately it was only one file, so doing a selective show via; ```bash git show origin/master:lib/stdlib/src/lists.erl > lib/stdlib/src/lists.erl ``` ... And then manually going through to re-add doctest line numbers, and adjust indentation, wasn't too much of a chore.
- Loading branch information