冲突解决

future-jpg · Dec 29, 2019 · 25264c4 · 25264c4
1 parent cfff433
commit 25264c4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 276 deletions.
diff --git a/...eproj/project.xcworkspace/xcuserdata/bytedance.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/bytedance.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...FmpegTest.xcodeproj/xcuserdata/bytedance.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...FmpegTest.xcodeproj/xcuserdata/bytedance.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -14,10 +14,10 @@
  filePath = "FFmpegTest/main.mm"
  startingColumnNumber = "9223372036854775807"
  endingColumnNumber = "9223372036854775807"
- startingLineNumber = "380"
- endingLineNumber = "380"
- landmarkName = "unknown"
- landmarkType = "0">
+ startingLineNumber = "295"
+ endingLineNumber = "295"
+ landmarkName = "video_refresh_timer(userdata)"
+ landmarkType = "9">
  <Actions>
  <BreakpointActionProxy
  ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">