patch 8.1.1842: test listed as flaky should no longer be flaky

Problem:    Test listed as flaky should no longer be flaky.
Solution:   Remove Test_popup_and_window_resize from the list of flaky tests.
            (Daniel Hahler, close #4807)
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c606cac..9b41b46 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -329,7 +329,6 @@
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
-      \ 'Test_popup_and_window_resize()',
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_raw_one_time_callback()',
diff --git a/src/version.c b/src/version.c
index 5e40a1f..568852b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1842,
+/**/
     1841,
 /**/
     1840,