Update pesterdb.sql

nullbind · web-flow · commit c0d5c724ac59 · 2016-07-25T10:15:59.000-05:00
diff --git a/tests/pesterdb.sql b/tests/pesterdb.sql
@@ -1,9 +1,5 @@
 -- Script: pesterdb.sql
-<<<<<<< HEAD
--- Description: This is a script for setting up a SQL Server 2014 instance for PowerUpSQL Pester Tests.
-=======
 -- Description: This script can be used to configure a new SQL Server 2014 instance for PowerUpSQL Pester tests.
->>>>>>> dev
 
 ------------------------------------------------------------
 -- Create Test SQL Logins
