Resolve conflicts

This commit was merged in pull request #10.
This commit is contained in:
lvrossem
2023-03-02 20:52:01 +01:00
275 changed files with 21338 additions and 11 deletions

View File

@@ -1,11 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class ChangeSceneOnClick : MonoBehaviour
{
public void loadScene(string sceneName) {
SceneManager.LoadScene(sceneName);
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class ChangeSceneOnClick : MonoBehaviour
{
public static void loadScene(string sceneName) {
SceneManager.LoadScene(sceneName);
}
}