Merge branch 'main' of https://github.com/fhhyyp/serein-flow

LICENSE

@@ -1,6 +1,10 @@
 MIT License
 
+<<<<<<< HEAD
 Copyright (c) 2024 fengjiayi
+=======
+Copyright (c) 2024 fhhyyp
+>>>>>>> 82453f79710ad298e60e269127421d512e240ea8
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,3 +1,9 @@
+<<<<<<< HEAD
 一款基于WPF（Dotnet 8）的流程可视化编辑器（需二次开发）
 B站个人空间：https://space.bilibili.com/33526379
 第一次用git，不太懂
+=======
+B站个人空间：https://space.bilibili.com/33526379
+源代码在master分支
+![image](https://github.com/fhhyyp/serein-flow/blob/main/%E6%95%88%E6%9E%9C%E5%9B%BE.png)
+>>>>>>> 82453f79710ad298e60e269127421d512e240ea8