clear merging conflict
This commit is contained in:
+15
-12
@@ -1,18 +1,21 @@
|
||||
.vs
|
||||
/StgSharp.Common/bin
|
||||
/StgSharp.Common/obj
|
||||
/TestResults
|
||||
/STgSharpTest/bin
|
||||
/STgSharpTest/obj
|
||||
/StgSharp.Script/obj
|
||||
/StgSharp.Script/bin
|
||||
/StgSharp.TerminalDialogue/build
|
||||
/StgSharp.TerminalDialogue/obj
|
||||
|
||||
/build
|
||||
/StgSharp.Model/bin
|
||||
/StgSharp.Model/obj
|
||||
/.cr
|
||||
/.idea
|
||||
/.vs
|
||||
/.vscode
|
||||
/StgSharp.Common/obj
|
||||
/StgSharp.Common/bin
|
||||
/StgSharp.Model/obj
|
||||
/StgSharp.Model/bin
|
||||
/StgSharp.Script/obj
|
||||
/StgSharp.Script/bin
|
||||
/StgSharp.TerminalDialogue/obj
|
||||
/StgSharp.TerminalDialogue/build
|
||||
/StgSharpDebug/obj
|
||||
/StgSharpDebug/bin
|
||||
/STgSharpTest/obj
|
||||
/STgSharpTest/bin
|
||||
/TestResults
|
||||
/StgSharp.Native/x64
|
||||
/StgSharp.Native/x64
|
||||
|
||||
Reference in New Issue
Block a user