Git uses special markers to indicate the start and end of the conflicted area:
<<<<<<< HEAD
and:
| #include "raylib.h" | |
| #include <memory> // Smart Pointers | |
| #include <vector> // std::vector | |
| #include <iostream> | |
| // ABSTRACT BASE CLASS (Shape) | |
| class Shape { | |
| protected: | |
| Vector2 position; | |
| Color color; | 
| #include "raylib.h" | |
| #include <cmath> | |
| #include <string> | |
| void DrawToggle(const Font& font, const Vector2& lampACentre, const std::string& labelA, const Vector2& lampBCentre, const std::string& labelB, float lampRadius, bool status) { | |
| DrawTextEx(font, labelA.c_str(), {lampACentre.x - 5, lampACentre.y - 45}, 20, 1.0f, DARKGRAY); | |
| DrawTextEx(font, labelB.c_str(), {lampBCentre.x - 5, lampBCentre.y - 45}, 20, 1.0f, DARKGRAY); | |
| DrawCircleV(lampACentre, lampRadius + 4.0f, DARKGRAY); | |
| DrawCircleV(lampACentre, lampRadius, !status ? ORANGE : GRAY); | 
| ply | |
| format ascii 1.0 | |
| comment : MagicaVoxel @ Ephtracy | |
| element vertex 2920 | |
| property float x | |
| property float y | |
| property float z | |
| property uchar red | |
| property uchar green | |
| property uchar blue | 
| Log file open, 04/17/23 12:22:26 | |
| LogWindows: Failed to load 'aqProf.dll' (GetLastError=0) | |
| LogWindows: File 'aqProf.dll' does not exist | |
| LogProfilingDebugging: Loading WinPixEventRuntime.dll for PIX profiling (from ../../../Engine/Binaries/ThirdParty/Windows/WinPixEventRuntime/x64). | |
| LogWindows: Failed to load 'VtuneApi.dll' (GetLastError=0) | |
| LogWindows: File 'VtuneApi.dll' does not exist | |
| LogWindows: Failed to load 'VtuneApi32e.dll' (GetLastError=0) | |
| LogWindows: File 'VtuneApi32e.dll' does not exist | |
| LogWindows: Started CrashReportClient (pid=24412) | |
| LogWindows: Custom abort handler registered for crash reporting. | 
| Log file open, 04/17/23 11:52:31 | |
| LogWindows: Failed to load 'aqProf.dll' (GetLastError=0) | |
| LogWindows: File 'aqProf.dll' does not exist | |
| LogProfilingDebugging: Loading WinPixEventRuntime.dll for PIX profiling (from ../../../Engine/Binaries/ThirdParty/Windows/WinPixEventRuntime/x64). | |
| LogWindows: Failed to load 'VtuneApi.dll' (GetLastError=0) | |
| LogWindows: File 'VtuneApi.dll' does not exist | |
| LogWindows: Failed to load 'VtuneApi32e.dll' (GetLastError=0) | |
| LogWindows: File 'VtuneApi32e.dll' does not exist | |
| LogWindows: Started CrashReportClient (pid=27956) | |
| LogWindows: Custom abort handler registered for crash reporting. | 
| # Visual Studio 2015 user specific files | |
| .vs/ | |
| # Compiled Object files | |
| *.slo | |
| *.lo | |
| *.o | |
| *.obj | |
| # Precompiled Headers | 
| #include <iostream> // std::cout | |
| #include <string> // std::string | |
| #include <vector> // std::vector | |
| #include <memory> // std::unique_ptr, std::make_unique | |
| class Animal { | |
| // Base Class - Eventually Abstract | |
| std::string name; | |
| protected: | 
| #include <iostream> | |
| class Base { | |
| protected: | |
| int value; // Derived class will have access. | |
| public: | |
| Base(int value) : value{value} { | |
| std::cout << "Base Constructor\n"; | |
| } | 
| #include "ofApp.h" | |
| //-------------------------------------------------------------- | |
| void ofApp::setup() { | |
| ofAddListener(ofGetWindowPtr()->events().keyPressed, this, | |
| &ofApp::keycodePressed); | |
| } | |
| //-------------------------------------------------------------- | |
| void ofApp::update(){ |