Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 7b54e6d0 7b54e6d0655c99e83ab015294faed6564b4a3672 by Sergey Poznyakoff
Options

Removed conflict indicator

1 parent 805c2895
Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
......@@ -21,7 +21,6 @@
* libsieve/actions.c (sieve_action_stop); Restored zero assignment
to pc. This is possible due to the changes to runtime.c
>>>>>>> 1.838
2004-01-05 Sergey Poznyakoff
* include/mailutils/libsieve.h (sieve_locus_t): New datatype.
......