From 8141ccaeb553a3bac91b361ce55a63d8ff01f415 Mon Sep 17 00:00:00 2001
From: Curtis Mattoon <cmattoon@cmattoon.com>
Date: Tue, 6 Aug 2013 21:43:49 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/cmattoon/Pico

Conflicts:
	lib/pico.php
---
 lib/pico.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pico.php b/lib/pico.php
index 17ca8b7..8f0ade1 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -218,6 +218,7 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
+
                         // Ignore Emacs (and Nano) temp files
                         if (in_array(substr($page, -1), array('~','#'))) {
 			    unset($pages[$key]);