From cc29ed64fa4cbe97f44a7a619fad840c7e12c787 Mon Sep 17 00:00:00 2001
From: uintgroup <logins@uint.sh>
Date: Thu, 10 Aug 2023 18:37:15 -0400
Subject: [PATCH] readme update

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 5c00d85..15ba3c4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-# selective-pause
-
-replaces OpenZeppelin Pausable contract with selector-specific pausability
-=======
 # Selective Pausable
 
 An expansion on OpenZeppelin's Pausable.sol contract, which adds the ability to pause/unpause a function by
@@ -11,4 +6,3 @@ its selector.
 This contract can work instead of, or along side the OpenZeppelin Pausable.sol contract.
 
 This contract is in development and should only be used after performing independent testing.
->>>>>>> dev