aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-04 22:03:37 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-04 22:03:37 -0400
commit22ea7be77b8739722efe3bedaa8b16a8c5d89cba (patch)
tree26e37c30a1fe20e6b9b81aff80597be20e0e3b5a /src
parent1bbe513591fd1366c6e029d952334c2f0b4e2bcb (diff)
parentee4d1f2ccea1d1d6158f5781caa12dfcc1aad11d (diff)
downloadrneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.tar.gz
rneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.tar.bz2
rneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.zip
Merge pull request #4540 from KillTheMule/vim-patch-1236
vim-patch: 7.4.1236
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7afd4c2e99..a475e25e92 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -442,7 +442,7 @@ static int included_patches[] = {
// 1239 NA
// 1238 NA
// 1237,
- // 1236,
+ 1236,
// 1235 NA
// 1234 NA
// 1233 NA