From 78d6e33865468aed57c30c0a55ec4b9d277c4455 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 16 Apr 2013 17:02:41 +0800
Subject: [PATCH] devin branch merge plus minor fixes

---
 .../stylesheets/personal_journal/desktop/journal_pages.css      | 2 +-
 .../panel/personal_journal/desktop/journal_window.html.erb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css b/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css
index 9945848e..098e5a4f 100644
--- a/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css
+++ b/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css
@@ -1,3 +1,3 @@
 /* css test*/
 
-#harry { font-size: 10px;}
\ No newline at end of file
+#harry { font-size: 10px;	}
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
index a5eb7bad..e1937e97 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
@@ -1,5 +1,5 @@
 <%= javascript_include_tag "personal_journal" %>
-<%= stylesheet_link_tag "personal_journal" %>
+<%= stylesheet_link_tag "/assets/personal_journal/desktop/journal_pages" %>
 <div id="journal_p">
   <div id="content">
     <div id="header" class="hh2">