From fe1222ad568956f1c75b275838337f98f39995f1 Mon Sep 17 00:00:00 2001
From: Chen Kasirer <ckasirer@ethz.ch>
Date: Fri, 4 Oct 2024 10:11:40 +0200
Subject: [PATCH] fixed merge error in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1333298b9a8..8a5f4487100 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Fixed support for `compas_gpython` in Rhino 8 Grasshopper CPython components.
+* Fixed `Graph.from_edges` always returning `None`.
 
 ### Removed
 
@@ -29,7 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed args for `SceneObject` on Grasshopper `Draw` component.
 * Replaced use of `Rhino.Geometry.VertexColors.SetColors` with a for loop and `SetColor` in `compas_ghpyton` since the former requires a `System.Array`.
 * Fixed `Mesh.face_circle`.
-* Fixed `Graph.from_edges`.
 
 ### Removed