Merge conflict

2 files changed, 5 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 294cbaf..bba4418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.htaccess
 .htpasswd
 settings.php
 posts/
diff --git a/viewpost.php b/viewpost.php
index 031dd0b..8c70f64 100644
--- a/viewpost.php
+++ b/viewpost.php
@@ -1,10 +1,12 @@
 <?php
+	require("settings.php");
+	require("functions.php");
+
 	if (!isset($_GET['post'])) {
 		header("location: $blogRoot");
 		exit(0);
 	}
-	require("settings.php");
-	require("functions.php");
+
 	$getpost = preg_replace('/\+/', ' ', $_GET['post']);
 	$post = file_get_contents("{$blogPosts}$getpost");
 	$post = preg_replace('/\n/', "<br>\n", $post);