From 653369e3cfce440d97767e6e926716d358d7c4fa Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 28 Mar 2013 12:37:58 -0400 Subject: [PATCH] resolving local stash merge --- cms/templates/settings_advanced.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html index 838af5ada9..acbbb7cd35 100644 --- a/cms/templates/settings_advanced.html +++ b/cms/templates/settings_advanced.html @@ -19,6 +19,12 @@ from contentstore import utils