From b5a83f150759a7910a6135e23c93c1d2289138b3 Mon Sep 17 00:00:00 2001
From: beckermr <becker.mr@gmail.com>
Date: Sat, 18 May 2024 15:57:44 -0500
Subject: [PATCH] Updated CHANGELOG for 3.36.0

---
 CHANGELOG.rst                                 | 24 +++++++++++++++++++
 news/1928-fix-macos-sdk-merge.rst             | 23 ------------------
 ...1929-lint-osx-misconfigurations-in-CBC.rst | 23 ------------------
 news/generated-readme                         |  3 ---
 news/lint_no_builds.rst                       |  3 ---
 5 files changed, 24 insertions(+), 52 deletions(-)
 delete mode 100644 news/1928-fix-macos-sdk-merge.rst
 delete mode 100644 news/1929-lint-osx-misconfigurations-in-CBC.rst
 delete mode 100644 news/generated-readme
 delete mode 100644 news/lint_no_builds.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 32d4ce2f9..fbc6ee68b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,30 @@ conda-smithy Change Log
 
 .. current developments
 
+v3.36.0
+====================
+
+**Added:**
+
+* Added new lint for no ``.ci_support`` files which indicates no packages being built.
+
+**Changed:**
+
+* Provide linter hints if macOS quantities are misconfigured in `conda_build_config.yaml` (#1929)
+
+**Fixed:**
+
+* Ensure MACOSX_SDK_VERSION does not end up lower than `c_stdlib_version` in variant configs (#1927 via #1928)
+* Only mark the toplevel LICENSE and README as generated files
+
+**Authors:**
+
+* Matthew R. Becker
+* H. Vetinari
+* Uwe L. Korn
+
+
+
 v3.35.1
 ====================
 
diff --git a/news/1928-fix-macos-sdk-merge.rst b/news/1928-fix-macos-sdk-merge.rst
deleted file mode 100644
index 4ed704fad..000000000
--- a/news/1928-fix-macos-sdk-merge.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-**Added:**
-
-* <news item>
-
-**Changed:**
-
-* <news item>
-
-**Deprecated:**
-
-* <news item>
-
-**Removed:**
-
-* <news item>
-
-**Fixed:**
-
-* Ensure MACOSX_SDK_VERSION does not end up lower than `c_stdlib_version` in variant configs (#1927 via #1928)
-
-**Security:**
-
-* <news item>
diff --git a/news/1929-lint-osx-misconfigurations-in-CBC.rst b/news/1929-lint-osx-misconfigurations-in-CBC.rst
deleted file mode 100644
index 30e6a6e42..000000000
--- a/news/1929-lint-osx-misconfigurations-in-CBC.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-**Added:**
-
-* <news item>
-
-**Changed:**
-
-* Provide linter hints if macOS quantities are misconfigured in `conda_build_config.yaml` (#1929)
-
-**Deprecated:**
-
-* <news item>
-
-**Removed:**
-
-* <news item>
-
-**Fixed:**
-
-* <news item>
-
-**Security:**
-
-* <news item>
diff --git a/news/generated-readme b/news/generated-readme
deleted file mode 100644
index 9a9172c89..000000000
--- a/news/generated-readme
+++ /dev/null
@@ -1,3 +0,0 @@
-**Fixed:**
-
-* Only mark the toplevel LICENSE and README as generated files
diff --git a/news/lint_no_builds.rst b/news/lint_no_builds.rst
deleted file mode 100644
index 9ff235025..000000000
--- a/news/lint_no_builds.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-**Added:**
-
-* Added new lint for no ``.ci_support`` files which indicates no packages being built.