Fix conflicts #60
Annotations
2 errors and 4 notices
Run cpp-linter/cpp-linter-action@v2:
DummyEngine/Core/Scene/SceneRenderer.cpp#L300
version control conflict marker in file
|
Check Linter Results
Process completed with exit code 1.
|
Run cpp-linter/cpp-linter-action@v2:
DummyEngine/Core/Console/ConsoleLayer.hpp#L1
File DummyEngine/Core/Console/ConsoleLayer.hpp does not conform to Custom style guidelines. (lines 19)
|
Run cpp-linter/cpp-linter-action@v2:
DummyEngine/Core/Rendering/Renderer/BufferLayout.cpp#L1
File DummyEngine/Core/Rendering/Renderer/BufferLayout.cpp does not conform to Custom style guidelines. (lines 116)
|
Run cpp-linter/cpp-linter-action@v2:
DummyEngine/Core/Rendering/RendererOpenGL/GLFrameBuffer.cpp#L1
File DummyEngine/Core/Rendering/RendererOpenGL/GLFrameBuffer.cpp does not conform to Custom style guidelines. (lines 108)
|
Run cpp-linter/cpp-linter-action@v2:
DummyEngine/Core/Application/Window.cpp#L1
File DummyEngine/Core/Application/Window.cpp does not conform to Custom style guidelines. (lines 13)
|
Loading