Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9e4fb8d

Browse files
Merge pull request #7 from gjuniioor/master
Fixing bug because merge
2 parents fc5ffb9 + fd55bca commit 9e4fb8d

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ disqus: testnaringu
3434
theme:
3535
creator: Rizky Ariestiyansyah
3636
codename: Naringu
37-
link: https://github.com/ariestiyansyah/naringu
37+
link: https://github.com/ariestiyansyah/naringu

‎_includes/head.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
2222

2323
<!-- Icons -->
24-
<link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
24+
<link rel="shortcut icon" href=".{{ site.baseurl }}public/favicon.ico">
2525

2626
<!-- RSS -->
27-
28-
<link rel="alternate" type="application/rss+xml" title="RSS" href="/atom.xml">
27+
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.baseurl }}atom.xml">
2928
<link rel="alternate" type="application/rss+xml" title="Mozilla RSS" href="feed.category.xml">
3029
</head>

‎_layouts/default.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
{% include head.html %}
55
{% include analytics.html %}
6-
7-
<body class="theme-6dd">
6+
7+
<body class="theme-6dd">
88

99
{% include sidebar.html %}
1010

@@ -24,7 +24,6 @@ <h3 class="masthead-title">
2424
</div>
2525

2626
<label for="sidebar-checkbox" class="sidebar-toggle"></label>
27-
2827
<script>
2928
(function(document) {
3029
var toggle = document.querySelector('.sidebar-toggle');

‎_posts/2015-02-21-Hello-Naringu.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Poole is the Jekyll Butler, serving as an upstanding and effective foundation fo
1818
* Related posts (time-based, because Jekyll) below each post
1919
* Syntax highlighting, courtesy Pygments (the Python-based code snippet highlighter)
2020

21+
<<<<<<< HEAD
22+
23+
=======
24+
>>>>>>> master
2125
### Download
2226

2327
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.

‎about/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
id: 8
32
title: About
43
author: ariestiyansyah
54
layout: page

‎contact/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ <h1>Hire me</h1>
1414
Naringu business contact form is here..
1515
</em>
1616
</p>
17-
<!-- Please change email below to your email to activate the form -->
18-
<form action="http://formspree.io/ariestiyansyah.rizky@gmail.com" role="form" method="POST">
17+
<!-- Please change the email below with your email to activate the form -->
18+
<form action="http://formspree.io/ariestiyansyah.rizky@gmail.com" role="form" method="POST">
1919
<div class="form-group">
2020
<label for="name">Your name?</label>
2121
<input type="text" name="name" class="form-control" required>

‎feed.category.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
55
<channel>
66
<title>{{ site.name | xml_escape }} - Naringu</title>
7+
<<<<<<< HEAD
8+
<description>Posts categorized as 'naringu'</description>
9+
=======
710
<description>Posts categorized as 'Naringu'</description>
11+
>>>>>>> master
812
<link>{{ site.url }}</link>
913
<atom:link href="{{ site.url }}feed.category.xml" rel="self" type="application/rss+xml" />
1014
{% for post in site.categories.naringu limit:10 %}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /