Merge pull request #7 from gjuniioor/master

Fixing bug because merge
ariestiyansyah · Jul 29, 2015 · 9e4fb8d · 9e4fb8d
2 parents fc5ffb9 + fd55bca
commit 9e4fb8d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/_config.yml b/_config.yml
@@ -34,4 +34,4 @@ disqus:             testnaringu
 theme:
   creator:			Rizky Ariestiyansyah
   codename:			Naringu
-  link:             https://github.com/ariestiyansyah/naringu
+  link:             https://github.com/ariestiyansyah/naringu
diff --git a/_includes/head.html b/_includes/head.html
@@ -21,10 +21,9 @@
   <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
 
   <!-- Icons -->
-  <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
+  <link rel="shortcut icon" href=".{{ site.baseurl }}public/favicon.ico">
 
   <!-- RSS -->
-
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
   <link rel="alternate" type="application/rss+xml" title="Mozilla RSS" href="feed.category.xml">
   </head>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -3,8 +3,8 @@
 
   {% include head.html %}
   {% include analytics.html %}
-  
-  <body class="theme-6dd">
+
+<body class="theme-6dd">
 
     {% include sidebar.html %}
 
@@ -24,7 +24,6 @@ <h3 class="masthead-title">
     </div>
 
     <label for="sidebar-checkbox" class="sidebar-toggle"></label>
-
     <script>
       (function(document) {
         var toggle = document.querySelector('.sidebar-toggle');

diff --git a/_posts/2015-02-21-Hello-Naringu.md b/_posts/2015-02-21-Hello-Naringu.md
@@ -18,6 +18,10 @@ Poole is the Jekyll Butler, serving as an upstanding and effective foundation fo
 * Related posts (time-based, because Jekyll) below each post
 * Syntax highlighting, courtesy Pygments (the Python-based code snippet highlighter)
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> master
 ### Download
 
 Naringu is developed on and hosted with GitHub. Head to the <a href="https://github.com/ariestiyansyah/naringu">GitHub repository</a> for downloads, bug reports, and features requests.

diff --git a/about/index.md b/about/index.md
@@ -1,5 +1,4 @@
 ---
-id: 8
 title: About
 author: ariestiyansyah
 layout: page

diff --git a/contact/index.html b/contact/index.html
@@ -14,8 +14,8 @@ <h1>Hire me</h1>
     Naringu business contact form is here..
     </em>
   </p>
-  <!-- Please change email below to your email to activate the form -->
-  <form action="http://formspree.io/ariestiyansyah.rizky@gmail.com" role="form" method="POST">
+  <!-- Please change the email below with your email to activate the form -->
+  <form action="http://formspree.io/ariestiyansyah.rizky@gmail.com" role="form" method="POST"> 
 <div class="form-group">
 <label for="name">Your name?</label>
       <input type="text" name="name" class="form-control" required>

diff --git a/feed.category.xml b/feed.category.xml
@@ -4,7 +4,11 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
 		<title>{{ site.name | xml_escape }} - Naringu</title>
+<<<<<<< HEAD
+		<description>Posts categorized as 'naringu'</description>
+=======
 		<description>Posts categorized as 'Naringu'</description>
+>>>>>>> master
 		<link>{{ site.url }}</link>
         <atom:link href="{{ site.url }}feed.category.xml" rel="self" type="application/rss+xml" />
 		{% for post in site.categories.naringu limit:10 %}