fix conflicts

README.md

@@ -1,15 +1,8 @@
 # eosio.token
-<<<<<<< HEAD
-## Version : 1.9.2
+## Version : 2.0.0-rc1
 
 The design of the EOSIO blockchain calls for a number of smart contracts that are run at a privileged permission level in order to support functions such as block producer registration and voting, token staking for CPU and network bandwidth, RAM purchasing, multi-sig, etc.  These smart contracts are referred to as the bios, boot, system, msig, wrap (formerly known as sudo) and token contracts.
 
-=======
-## Version : 2.0.0-develop
-
-The design of the EOSIO blockchain calls for a number of smart contracts that are run at a privileged permission level in order to support functions such as block producer registration and voting, token staking for CPU and network bandwidth, RAM purchasing, multi-sig, etc.  These smart contracts are referred to as the bios, boot, system, msig, wrap (formerly known as sudo) and token contracts.
-
->>>>>>> develop
 This repository contains a reference token example contracts that are useful when deploying a token using an EOSIO blockchain.  It is provided for reference purposes:
 
 The following unprivileged contract(s) are in this repository.

docs.json

@@ -11,11 +11,7 @@
       "name": "mdjavadoc",
       "options": {
         "source_dirs": [
-<<<<<<< HEAD
           "contracts/eosio.token/include/eosio.token/"
-=======
-          "contracts/eosio.token/include/eosio.token/",
->>>>>>> develop
         ],
         "output_dir": "action-reference"
       }

pipeline.jsonc

@@ -4,11 +4,7 @@
         "pipeline-branch": "master",
         "dependencies": // dependencies to pull for a build of contracts, by branch, tag, or commit hash
         {
-<<<<<<< HEAD
             "eosio": "v2.1.0-rc3",
-=======
-            "eosio": "develop", 
->>>>>>> develop
             "eosio.cdt": "v1.8.0-rc1"
         }
     }

tests/main.cpp

@@ -10,11 +10,6 @@
 #include <eosio/chain/exceptions.hpp>
 #include <Runtime/Runtime.h>
 
-<<<<<<< HEAD
-=======
-// #include "eosio.system_tester.hpp"
-
->>>>>>> develop
 // using namespace eosio_system;
 #define BOOST_TEST_STATIC_LINK