Skip to content

Commit b8c41c5

Browse files
committed
small merge fixes
1 parent cea8ac5 commit b8c41c5

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Unity.Netcode.Components;
2-
using Unity.Netcode.Editor;
32
using UnityEditor;
43
using UnityEngine;
54

testproject/Assets/Tests/Runtime/TestProject.Runtime.Tests.asmdef

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"Unity.Mathematics",
1616
"UnityEngine.TestRunner",
1717
"UnityEditor.TestRunner",
18-
"Unity.Netcode.Runtime.Tests",
19-
"Unity.Netcode.GameObjects.Editor"
18+
"Unity.Netcode.Runtime.Tests"
2019
],
2120
"includePlatforms": [],
2221
"excludePlatforms": [],

0 commit comments

Comments
 (0)