Unknown mess

Source/Integration/ConsoleOutput.h

@@ -1,13 +1,32 @@
+////////////////////////////////////////////////////////////
+//
+// ConsoleOutput.h
+//
+// Optional helper for the console window. The
+// GameMode blueprint can use this class to store
+// console text as one big string with newlines.
+//
+// A dirty bit is set whenever text is appended,
+// so the blueprint only needs to update the widget
+// when the text has actually changed.
+//
+////////////////////////////////////////////////////////////
+
 #pragma once
 
 #include "Containers/UnrealString.h"
 
 #include "ConsoleOutput.generated.h"
 
+<<<<<<< HEAD
 //////////////////////////////////////////////////////////////
+=======
+////////////////////////////////////////////////////////////
+>>>>>>> 9b1dd00a45a7b17c3546f8574d00e5ec78f17c75
 //
-// ConsoleOutput
+// UlxConsoleOutput
 //
+<<<<<<< HEAD
 // When the lua code executes a print statement, the text
 // eventually gets passed to the GameMode blueprint: see
 // Docs/Print-Statement-Handling.md for more information.
@@ -34,6 +53,9 @@
 // implement the virtual console, that's perfectly fine.
 //
 //////////////////////////////////////////////////////////////
+=======
+////////////////////////////////////////////////////////////
+>>>>>>> 9b1dd00a45a7b17c3546f8574d00e5ec78f17c75
 
 UCLASS(BlueprintType)
 class UlxConsoleOutput : public UObject
@@ -45,36 +67,46 @@ private:
 	bool Dirty;
 
 private:
-	// Truncate the console to a reasonable number of
-	// lines.  The length is hardwired.
+	// Truncate the console to a reasonable number of lines.
+	// The length is hardwired.
+	//
 	void Truncate();
 
-	// Add a newline if there isn't one.  Returns true if it changed anything.
+	// Add a newline if there isn't one.
+	//
+	// Returns true if it changed anything.
+	//
 	bool MaybeAppendNewline();
 
-	// Append text.  Returns true if it changed anything.
+	// Append text.
+	// 
+	// Returns true if it changed anything.
+	//
 	bool MaybeAppendText(const FString& text);
 
 public:
-	// Append a line of text to the console.
+	// Append text to the console.
+	//
 	UFUNCTION(BlueprintCallable)
 	void Append(const FString& text);
 
-	// Append a line of text to the console on a line by itself.
+	// Append text on a line by itself.
+	//
 	UFUNCTION(BlueprintCallable)
 	void AppendLine(const FString& text);
 
 	// Get the console text as a string.
+	//
 	UFUNCTION(BlueprintCallable)
 	const FString& Get() const { return Content;  }
-	
+
 	// Return if the dirty flag is set.
+	//
 	UFUNCTION(BlueprintCallable)
 	bool IsDirty() const { return Dirty; }
 
 	// Clear the dirty flag.
+	//
 	UFUNCTION(BlueprintCallable)
 	void ClearDirty() { Dirty = false;  }
 };
-
-