Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor

source/module.xml

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8" ?>
+=======
+<?xml version="1.0" encoding="utf-8"?>
+>>>>>>> origin/note-redux
 <module>
 	<!-- A module provides additional behavior and configuration for HaxeUI. -->
 	<components>
@@ -7,6 +11,7 @@
 			This needs to be done HERE and not via the `include` macro because `Toolkit.init()`
 			reads this to build the component registry.
 		-->
+<<<<<<< HEAD
 		<class package="haxe.ui.core" loadAll="true" />
 
 		<class package="haxe.ui.components" loadAll="true" />
@@ -18,5 +23,10 @@
 		
 		<!-- Custom components. -->
 		<class package="funkin.ui.haxeui.components" loadAll="true" />
+=======
+		<class package="haxe.ui.components" loadAll="true" />
+		<class package="haxe.ui.containers" loadAll="true" />
+		<class package="haxe.ui.core" loadAll="true" />
+>>>>>>> origin/note-redux
 	</components>
 </module>