From cc020bb6f01491b29b006c93209b77987e7c01ec Mon Sep 17 00:00:00 2001
From: Farhan Khan <farhan@farhan.codes>
Date: Thu, 17 Dec 2020 01:37:34 +0000
Subject: [PATCH] Merged the two directories, no need to keep them separate

---
 .gitignore                                        | 2 ++
 engine/Makefile => Makefile                       | 0
 engine/config.go => config.go                     | 0
 engine/config.jsonc.sample => config.jsonc.sample | 0
 engine/ctl.go => ctl.go                           | 0
 engine/db.go => db.go                             | 0
 client/fedictl.go => fedictl.go                   | 0
 engine/fedilogue.go => fedilogue.go               | 0
 engine/headers.go => headers.go                   | 0
 engine/instance.go => instance.go                 | 0
 engine/oauth.go => oauth.go                       | 0
 engine/poll.go => poll.go                         | 0
 engine/stream.go => stream.go                     | 0
 engine/tables.sql => tables.sql                   | 0
 engine/web.go => web.go                           | 0
 15 files changed, 2 insertions(+)
 rename engine/Makefile => Makefile (100%)
 rename engine/config.go => config.go (100%)
 rename engine/config.jsonc.sample => config.jsonc.sample (100%)
 rename engine/ctl.go => ctl.go (100%)
 rename engine/db.go => db.go (100%)
 rename client/fedictl.go => fedictl.go (100%)
 rename engine/fedilogue.go => fedilogue.go (100%)
 rename engine/headers.go => headers.go (100%)
 rename engine/instance.go => instance.go (100%)
 rename engine/oauth.go => oauth.go (100%)
 rename engine/poll.go => poll.go (100%)
 rename engine/stream.go => stream.go (100%)
 rename engine/tables.sql => tables.sql (100%)
 rename engine/web.go => web.go (100%)

diff --git a/.gitignore b/.gitignore
index 8bc9299..4253606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 fedilogue
 fedictl
 config.jsonc
+keys/*
+clients/*
diff --git a/engine/Makefile b/Makefile
similarity index 100%
rename from engine/Makefile
rename to Makefile
diff --git a/engine/config.go b/config.go
similarity index 100%
rename from engine/config.go
rename to config.go
diff --git a/engine/config.jsonc.sample b/config.jsonc.sample
similarity index 100%
rename from engine/config.jsonc.sample
rename to config.jsonc.sample
diff --git a/engine/ctl.go b/ctl.go
similarity index 100%
rename from engine/ctl.go
rename to ctl.go
diff --git a/engine/db.go b/db.go
similarity index 100%
rename from engine/db.go
rename to db.go
diff --git a/client/fedictl.go b/fedictl.go
similarity index 100%
rename from client/fedictl.go
rename to fedictl.go
diff --git a/engine/fedilogue.go b/fedilogue.go
similarity index 100%
rename from engine/fedilogue.go
rename to fedilogue.go
diff --git a/engine/headers.go b/headers.go
similarity index 100%
rename from engine/headers.go
rename to headers.go
diff --git a/engine/instance.go b/instance.go
similarity index 100%
rename from engine/instance.go
rename to instance.go
diff --git a/engine/oauth.go b/oauth.go
similarity index 100%
rename from engine/oauth.go
rename to oauth.go
diff --git a/engine/poll.go b/poll.go
similarity index 100%
rename from engine/poll.go
rename to poll.go
diff --git a/engine/stream.go b/stream.go
similarity index 100%
rename from engine/stream.go
rename to stream.go
diff --git a/engine/tables.sql b/tables.sql
similarity index 100%
rename from engine/tables.sql
rename to tables.sql
diff --git a/engine/web.go b/web.go
similarity index 100%
rename from engine/web.go
rename to web.go