From 3a3cf8f4da6416d246e41528416112198f695cab Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 2 Feb 2023 20:29:05 -0800 Subject: [ci skip] remove umerged conflict markers in RELEASE.txt --- RELEASE.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 1bf6bf8..31b56aa 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -148,17 +148,14 @@ DOCUMENTATION - Updated the User Guide chapter on installation: modernized the notes on Python installs, SCons installs, and having multiple SCons versions present on a single system. -<<<<<<< HEAD - Updated the User Guide chapter on variant directories with more explanation, and the introduction of terms like "out of tree" that may help in forming a mental model. - Additional explanations for MSVSProject and MSVSSolution builders. - Updated MSVC documentation - adds "version added" annotations on recently added construction variables and provides a version-mapping table. -======= - Added further details in the documentation of Append and related methods on the special handling of CPPDEFINES. ->>>>>>> d9a82d681 (Split out CPPDEFINES handling in Append methods) DEVELOPMENT ----------- -- cgit v0.12