From 3f44b5d9213b79bc9f48992af53d73d599917959 Mon Sep 17 00:00:00 2001
From: noxymon <avicienna.ulhaq@gmail.com>
Date: Wed, 3 May 2017 21:47:43 +0700
Subject: [PATCH] [20170502][SENA]Resolve some conflict

---
 .gitignore        |  2 +-
 composer.json     | 38 ++++++++++++++++++++------------------
 config/config.ini | 10 +++++-----
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0672e93..3d6db03 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@
 /content/noxymon/
 /themes/bootstrap/nbproject/private/
 /themes/bootstrap/
-/nbproject/
\ No newline at end of file
+/nbproject/
diff --git a/composer.json b/composer.json
index 6cf7a86..5615cd2 100755
--- a/composer.json
+++ b/composer.json
@@ -1,22 +1,24 @@
 {
-	"config": {
-		"vendor-dir": "system/vendor/",
-		"optimize-autoloader": true
-	},
+    "config": {
+        "vendor-dir": "system/vendor/",
+        "optimize-autoloader": true,
+        "platform": {
+            "php": "5.3"
+        }
+    },
     "require": {
-		"ircmaxell/password-compat": "^1.0",
-		"michelf/php-markdown": "^1.5",
-		"suin/php-rss-writer": "^1.3",
-		"kanti/hub-updater": "^0.4.0"
+        "ircmaxell/password-compat": "^1.0",
+        "michelf/php-markdown": "^1.5",
+        "suin/php-rss-writer": "^1.3",
+        "kanti/hub-updater": "^0.4.0"
     },
-	"autoload": {
-		"files": [
-			"system/includes/dispatch.php",
-			"system/includes/functions.php",
-			"system/admin/admin.php",
-			"system/includes/session.php",
-			"system/includes/opml.php",
-			"system/plugins/urlify/URLify.php"
-		]
-	}
+    "autoload": {
+        "files": [
+            "system/includes/dispatch.php",
+            "system/includes/functions.php",
+            "system/admin/admin.php",
+            "system/includes/session.php",
+            "system/includes/opml.php"
+        ]
+    }
 }
diff --git a/config/config.ini b/config/config.ini
index 35e3e6c..111c3da 100755
--- a/config/config.ini
+++ b/config/config.ini
@@ -8,7 +8,7 @@ timezone = "Asia/Jakarta"
 blog.title = "HTMLy"
 blog.tagline = "Let's get rocks !"
 blog.description = "Proudly powered by HTMLy, a databaseless blogging platform."
-blog.copyright = "@noxymon"
+blog.copyright = ""
 
 ; Set permalink type. "default" using /year/month/title. "post" using /post/title
 permalink.type = "default"
@@ -20,7 +20,7 @@ static.frontpage = "false"
 blog.enable = "false"
 
 ; Social account
-social.twitter = "https://twitter.com/noxymon"
+social.twitter = "https://twitter.com"
 social.facebook = "https://www.facebook.com"
 social.google = "https://plus.google.com"
 social.tumblr = "http://www.tumblr.com"
@@ -34,7 +34,7 @@ blog.menu = ""
 breadcrumb.home = "Home"
 
 ; Comment system. Choose "facebook", "disqus", or "disable".
-comment.system = "disqus"
+comment.system = "disable"
 
 ; Facebook comments
 fb.appid = ""
@@ -42,7 +42,7 @@ fb.num = "5"
 fb.color = "light"
 
 ; Disqus comments
-disqus.shortname = "noxymon"
+disqus.shortname = ""
 
 ; Google Web Master Tool ID verification
 google.wmt.id = ""
@@ -138,7 +138,7 @@ generation.time = "false"
 cache.timestamp = "false"
 
 ; Set the theme here
-views.root = "themes/bootstrap"
+views.root = "themes/blog"
 
 ; Framework config. No need to edit.
 views.layout = "layout"
\ No newline at end of file