Resolve merge conflicts

1 files changed, 14 insertions, 0 deletions

diff --git a/components/container.js b/components/container.js
new file mode 100644
index 0000000..f7ea709
--- /dev/null
+++ b/components/container.js
@@ -0,0 +1,14 @@
+import React from "react";
+
+const Container = (props) => {
+  return (
+    <div
+      className={`container p-8 mx-auto xl:px-0 ${
+        props.className ? props.className : ""
+      }`}>
+      {props.children}
+    </div>
+  );
+}
+
+export default Container;
\ No newline at end of file