change order of synopsis and code, remove merge markings

Author: Robert-Andrzejuk-Infor

include/beman/scope/scope.hpp

@@ -5,34 +5,6 @@
 
 namespace beman::scope {
 
-<<<<<<< HEAD
-// TODO: Implement
-struct scope_exit {
-    template <typename F>
-    scope_exit(F) {}
-    ~scope_exit() {
-        // TODO: Cleanup
-    }
-};
-
-// TODO: Implement
-struct scope_fail {
-    template <typename F>
-    scope_fail(F) {}
-    ~scope_fail() {
-        // TODO: Cleanup
-    }
-};
-
-// TODO: Implement
-struct scope_success {
-    template <typename F>
-    scope_success(F) {}
-    ~scope_success() {
-        // TODO: Cleanup
-    }
-};
-=======
 // -- 7.6.7 Feature test macro --
 //
 //        __cpp_lib_scope
@@ -120,7 +92,34 @@ struct scope_success {
 //
 //        template <typename R, typename D>
 //        unique_resource(R, D) -> unique_resource<R, D>;
->>>>>>> a30545a (Copy synopsis from p0052r10.pdf)
+
+
+// TODO: Implement
+struct scope_exit {
+    template <typename F>
+    scope_exit(F) {}
+    ~scope_exit() {
+        // TODO: Cleanup
+    }
+};
+
+// TODO: Implement
+struct scope_fail {
+    template <typename F>
+    scope_fail(F) {}
+    ~scope_fail() {
+        // TODO: Cleanup
+    }
+};
+
+// TODO: Implement
+struct scope_success {
+    template <typename F>
+    scope_success(F) {}
+    ~scope_success() {
+        // TODO: Cleanup
+    }
+};
 
 } // namespace beman::scope