Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
JerryImMouse committed Jul 12, 2024
1 parent dda9311 commit ac3d91b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Hypercube.Shared/EventBus/EventBus.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.Runtime.CompilerServices;
using Hypercube.Shared.EventBus.Broadcast;
using Hypercube.Shared.EventBus.Events;
using Hypercube.Shared.EventBus.Events.Broadcast;
using Hypercube.Shared.EventBus.Events.Events;
using Hypercube.Shared.EventBus.Events.Exceptions;
using Hypercube.Shared.EventBus.Events.Handlers;
using Hypercube.Shared.EventBus.Exceptions;
using Hypercube.Shared.EventBus.Handlers;
using Hypercube.Shared.Utilities;
using Hypercube.Shared.Utilities.Units;

Expand Down
4 changes: 3 additions & 1 deletion Hypercube.Shared/EventBus/Handlers/RefHandler.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
namespace Hypercube.Shared.EventBus.Handlers;
using Hypercube.Shared.Utilities.Units;

namespace Hypercube.Shared.EventBus.Handlers;

public delegate void RefHandler(ref Unit ev);

0 comments on commit ac3d91b

Please sign in to comment.