readme update

uintgroup · Aug 10, 2023 · cc29ed6 · cc29ed6
1 parent 642fae5
commit cc29ed6
Showing 1 changed file with 0 additions and 6 deletions.
diff --git 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