From 64e9bf97a38629ca0adbbcf0507b110e192414f4 Mon Sep 17 00:00:00 2001
From: John Fletcher <J.P.Fletcher@aston.ac.uk>
Date: Wed, 5 Feb 2014 20:54:41 +0000
Subject: [PATCH] version.hpp resolve conflict

---
 include/boost/phoenix/version.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/boost/phoenix/version.hpp b/include/boost/phoenix/version.hpp
index acb8ed8..1dc9297 100644
--- a/include/boost/phoenix/version.hpp
+++ b/include/boost/phoenix/version.hpp
@@ -28,5 +28,4 @@
 #define BOOST_PHOENIX_VERSION_NUMBER = BOOST_VERSION_NUMBER(3,0,4)
 #endif
 
-
 #endif