diff --git a/README.md b/README.md index 26c12f10..6de17536 100644 --- a/README.md +++ b/README.md @@ -79,12 +79,7 @@ and technical support. GNU General Public License for more details. You should have received a copy of the GNU General Public License -<<<<<<< HEAD along with this program. If not, see . - [Testing from windows] -======= - along with this program. If not, see . ->>>>>>> 03070a0b088748f380da442c2df87fc41ccf15ef ## Contributors