Permalink
Browse files

completed merge

  • Loading branch information...
1 parent 995328c commit cd92013b013fb68b13270c031f5f4d1808199d28 Greg Dennis committed Dec 15, 2016
Showing with 1 addition and 1 deletion.
  1. +1 −1 Manatee.Json.sln.DotSettings.user
@@ -13,6 +13,6 @@
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark1/FileId/@EntryValue">6ADF0BCF-4E46-4605-A784-51EA6DAC81C7/d:Path/d:Expressions/f:IsLessThanExpression.cs</s:String>
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark1/Owner/@EntryValue">NumberedBookmarkManager</s:String>
<s:Boolean x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark9/@KeyIndexDefined">True</s:Boolean>
- <s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark9/Coords/@EntryValue">(Doc Ln 201 Col 29)</s:String>
+ <s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark9/Coords/@EntryValue">(Doc Ln 206 Col 21)</s:String>
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark9/FileId/@EntryValue">6ADF0BCF-4E46-4605-A784-51EA6DAC81C7/d:Serialization/d:Internal/d:Serializers/f:AutoSerializer.cs</s:String>
<s:String x:Key="/Default/Housekeeping/Bookmarks/NumberedBookmarks/=Bookmark9/Owner/@EntryValue">NumberedBookmarkManager</s:String></wpf:ResourceDictionary>

0 comments on commit cd92013

Please sign in to comment.