From cdc4314081ae9e8f98dcc5f6332eb04ea92b18e1 Mon Sep 17 00:00:00 2001
From: Swaroop C H <swaroop@swaroopch.com>
Date: Sun, 8 Mar 2015 23:51:27 -0700
Subject: [PATCH] Add Prelude tip on keyboard shortcut to join lines

---
 core/prelude-core.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/prelude-core.el b/core/prelude-core.el
index 76c5fa0..82add93 100644
--- a/core/prelude-core.el
+++ b/core/prelude-core.el
@@ -392,6 +392,7 @@ Doesn't mess with special buffers."
     "Press <C-c C-z> in a Elisp buffer to launch an interactive Elisp shell."
     "Press <C-Backspace> to kill a line backwards."
     "Press <C-S-Backspace> or <s-k> to kill the whole line."
+    "Press <s-j> or <C-^> to join lines."
     "Press <f11> to toggle fullscreen mode."
     "Press <f12> to toggle the menu bar."
     "Explore the Tools->Prelude menu to find out about some of Prelude extensions to Emacs."