aboutsummaryrefslogtreecommitdiff
path: root/ports/boost/CONTROL
diff options
context:
space:
mode:
Diffstat (limited to 'ports/boost/CONTROL')
-rw-r--r--ports/boost/CONTROL4
1 files changed, 4 insertions, 0 deletions
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 1743379fb..7001c968a 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,4 +1,8 @@
Source: boost
+<<<<<<< HEAD
Version: 1.65-2
+=======
+Version: 1.65.1
+>>>>>>> master
Description: Peer-reviewed portable C++ source libraries
Build-Depends: zlib, bzip2, icu [windows], python3 [windows]