mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 21:01:35 +08:00
Ignoring Rebracer changes
Line orders would change randomly
This commit is contained in:
parent
2d4c87d1d7
commit
bb5c6e2ed1
1
.gitignore
vendored
1
.gitignore
vendored
@ -188,3 +188,4 @@ src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
|
||||
#enable all /lib artifacts
|
||||
!lib/**/*.*
|
||||
*/.vs/*
|
||||
src/Rebracer.xml
|
||||
|
@ -10,8 +10,8 @@
|
||||
<ToolsOptionsCategory name="Environment">
|
||||
<ToolsOptionsSubCategory name="TaskList">
|
||||
<PropertyValue name="CommentTokens" ArrayType="VT_VARIANT" ArrayElementCount="4">
|
||||
<PropertyValue name="0">TODO:2</PropertyValue>
|
||||
<PropertyValue name="1">HACK:2</PropertyValue>
|
||||
<PropertyValue name="0">HACK:2</PropertyValue>
|
||||
<PropertyValue name="1">TODO:2</PropertyValue>
|
||||
<PropertyValue name="2">UNDONE:2</PropertyValue>
|
||||
<PropertyValue name="3">UnresolvedMergeConflict:3</PropertyValue>
|
||||
</PropertyValue>
|
||||
|
Loading…
Reference in New Issue
Block a user