Skip to content

Commit

Permalink
Upgrade go-jwlm bin. for merging InputFields
Browse files Browse the repository at this point in the history
This adds support for merging InputFields.
See AndreasSko/go-jwlm#52
  • Loading branch information
AndreasSko committed Mar 22, 2021
1 parent 2952d2d commit 69bcb8f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
Binary file modified Gomobile.framework/Versions/A/Gomobile
Binary file not shown.
5 changes: 5 additions & 0 deletions Gomobile.framework/Versions/A/Headers/Gomobile.objc.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ of the slices.
- (nonnull instancetype)init;
@property (nonatomic) long blockRange;
@property (nonatomic) long bookmark;
@property (nonatomic) long inputField;
@property (nonatomic) long location;
@property (nonatomic) long note;
@property (nonatomic) long tag;
Expand Down Expand Up @@ -72,6 +73,10 @@ function calls. Should be called after ImportJWLBackup.
* MergeBookmarks merges bookmarks
*/
- (BOOL)mergeBookmarks:(NSString* _Nullable)conflictSolver mcw:(GomobileMergeConflictsWrapper* _Nullable)mcw error:(NSError* _Nullable* _Nullable)error;
/**
* MergeInputField merges inputFields
*/
- (BOOL)mergeInputFields:(NSString* _Nullable)conflictSolver mcw:(GomobileMergeConflictsWrapper* _Nullable)mcw error:(NSError* _Nullable* _Nullable)error;
/**
* MergeLocations merges locations
*/
Expand Down

0 comments on commit 69bcb8f

Please sign in to comment.