Support to themes and test

Siedrix · Oct 4, 2014 · 82e3dbf · 82e3dbf
2 parents e8405bd + 16236ed
commit 82e3dbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -65,9 +65,8 @@ For scafolding check this [yeoman repo](https://github.com/Siedrix/generator-pap
 
 # Todos
 
-- Snippets
 - Pagination
-- Categorias
+- Categories
 - Exposed article, pages, snipped object
 
 # Nice to haves

diff --git a/paperpress.js b/paperpress.js
@@ -176,13 +176,14 @@ Paperpress.prototype.getArticlesInPage = function (page) {
 Paperpress.prototype.attach = function(server) {
 	var paperpress = this;
 
+<<<<<<< HEAD
 	// Add static files
 	server.use( '/'+paperpress.staticPath , express.static( process.cwd() + '/' + paperpress.themeStatic ) );
 
 	console.log('attaching paperpress');
+=======
+>>>>>>> 16236ed6fc113633a3948fc5508ae8b898a4ee5f
 	server.use(function(req, res, next){
-		console.log('Adding paperpress context');
-
 		res.locals.paperpress = paperpress.buildContext();
 
 		next();