{"header":{"message":"Conflict resolution","description":null,"timestamp":"2023-06-08T08:31:34.365076014Z","authors":[{}]},"hash":"M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC","authors":[{"login":"paradyx","key":"5AMTvjBCcPzaCthP7D55pufHFs8VkiFuYRMjh3JoBJdy"}],"deps":{"hashes":[["M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC","Conflict resolution"],["AA",null],["QIVGMR6INKBVT5IFCO2UJJQEO4PVW3ZM7IDTCTCOKOX7VKG7UPFAC","WIP"],["JCK77YLTPL6VV5ZOTMGUJSFZ5DNMS3MZGP5UQLXYW6WSMEK6GAQAC","WIP"],["RVA3DOCNBWFBWA2MLC2TVQOEY25AUCYGEJSWMD72QRQ26AFLVZUAC","More stochastic"],["DJPCS5EU6K5RJO2XKRJ53PS4WYECL63UPHY54K7QWCZNXIJRQI4AC","Bring back colors in jabref"],["567NUQ633R5ESTE2LWXVUGM7XEZGJ65IRKPOCDZJS3JE5RAMR5KAC","Initial"],["QCVDPRXH57UFLU4YV3P2I5RQZGCBUKROYUZHDWOCHL43KDYN7MPAC","WIP"]],"deps":["QIVGMR6INKBVT5IFCO2UJJQEO4PVW3ZM7IDTCTCOKOX7VKG7UPFAC"],"known":["JCK77YLTPL6VV5ZOTMGUJSFZ5DNMS3MZGP5UQLXYW6WSMEK6GAQAC","DJPCS5EU6K5RJO2XKRJ53PS4WYECL63UPHY54K7QWCZNXIJRQI4AC","RVA3DOCNBWFBWA2MLC2TVQOEY25AUCYGEJSWMD72QRQ26AFLVZUAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":18034},"path":"literature.bib","line":137,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":24602},"to":{"change":3,"start":24602,"end":24615},"introduced_by":3}],"inode":{"change":3,"pos":18034}}},"contents":[{"Del":{"text":"<<<<<<< HEAD","pos":"JCK77YLTPL6VV5ZOTMGUJSFZ5DNMS3MZGP5UQLXYW6WSMEK6GAQAC:24614"}}]}},{"Edit":{"inode":{"change":7,"pos":7949},"path":"ch3_theory.tex","line":101,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2943}],"down_context":[{"change":2,"pos":10501}],"flag":"BLOCK","start":0,"end":92,"inode":{"change":7,"pos":7949}}},"contents":[{"Add":{"text":">>>>>>> 1 [LOQBLRZ6 ]","pos":"M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC:21"}},{"Add":{"text":"\\section{Abstraction}\\label{sec:abstraction}","pos":"M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC:66"}},{"Add":{"text":"======= 1 [QIVGMR6I WIP]","pos":"M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC:91"}}]}},{"Edit":{"inode":{"change":7,"pos":7949},"path":"ch3_theory.tex","line":105,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":10546}],"down_context":[{"change":8,"pos":2943}],"flag":"BLOCK","start":93,"end":103,"inode":{"change":7,"pos":7949}}},"contents":[{"Add":{"text":"<<<<<<< 1","pos":"M5WHUJXX7KNK425RXFM2U6WT3M4PARJFO7T7MLN2IBDEYDKPXTMAC:102"}}]}}],"owner":"paradyx","repo":"ma-tex","token":"92ETKYLN3OIdkx+3IjWUwAqy1vpeO7r6c//713Rg14Q=","login":null}

…

Dependencies

Change contents

Review