From f494f68237edc6aa00283cb79c2eda1a777d8db1 Mon Sep 17 00:00:00 2001
From: levinsv <44033647+levinsv@users.noreply.github.com>
Date: Tue, 16 Oct 2018 22:57:06 +0500
Subject: [PATCH] Update include/pgAdmin3.h

---
 include/pgAdmin3.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/pgAdmin3.h b/include/pgAdmin3.h
index e30a97c..38ca34e 100644
--- a/include/pgAdmin3.h
+++ b/include/pgAdmin3.h
@@ -58,7 +58,6 @@
 // Supported server minimum and maximum values.
 const short SERVER_MIN_VERSION_N = 0x0804;
 const wxString SERVER_MIN_VERSION_T = wxT("8.4");
-<<<<<<< HEAD
 const short SERVER_MAX_VERSION_N = 0x0C00;
 const wxString SERVER_MAX_VERSION_T = wxT("12");
 // Supported Greenplum Database and Greenplum HAWQ minimum and maximum values.