I also get it. Can you open an issue in the SymPy-bot tracker for it (or better yet, submit a pull request fixing it)? It's similar to https://github.com/sympy/sympy-bot/issues/64.
Aaron Meurer On Sun, Dec 11, 2011 at 2:42 PM, krastanov.ste...@gmail.com <krastanov.ste...@gmail.com> wrote: > Hi, > > Am I the only one to get this error: > > Auto-merging doc/src/modules/assumptions/index.txt > Auto-merging sympy/core/expr.py > CONFLICT (content): Merge conflict in sympy/core/expr.py > Automatic merge failed; fix conflicts and then commit the result. > Done. > > View log at: /tmp/sympy-bot-tmpmSdoXH/out/log > Traceback (most recent call last): > File "./sympy-bot", line 279, in <module> > main() > File "./sympy-bot", line 97, in main > review(n, options) > File "./sympy-bot", line 244, in review > master_hash = result["master_hash"] > KeyError: 'master_hash' > > -- > You received this message because you are subscribed to the Google Groups > "sympy" group. > To post to this group, send email to sympy@googlegroups.com. > To unsubscribe from this group, send email to > sympy+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/sympy?hl=en. -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sympy@googlegroups.com. To unsubscribe from this group, send email to sympy+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
