diff options
| author | Johann Klähn <kljohann@gmail.com> | 2013-01-18 18:26:03 +0100 |
|---|---|---|
| committer | Johann Klähn <kljohann@gmail.com> | 2013-01-18 18:26:03 +0100 |
| commit | b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed (patch) | |
| tree | cd5008b6a42cd65c9fe668a92e10237fcec335c4 /test/baseline/cmd-convert.test | |
| parent | 83bd3234d32d7a82d583e4f50f8f90837aa15a93 (diff) | |
| parent | 385cbd25b9905b16a4c7723bb4e5a5813e84aab0 (diff) | |
| download | fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.tar.gz fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.tar.bz2 fork-ledger-b3b11bed3be9c7a6dcd4a4427eb02fa7d92f34ed.zip | |
Merge branch 'master' into next
Some commits were on the master branch but not yet on the next branch due to a
pull request to master after those two branches diverged. This merge
ensures that next ⊇ master.
Diffstat (limited to 'test/baseline/cmd-convert.test')
| -rw-r--r-- | test/baseline/cmd-convert.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/baseline/cmd-convert.test b/test/baseline/cmd-convert.test index 1c36d4bb..d444da52 100644 --- a/test/baseline/cmd-convert.test +++ b/test/baseline/cmd-convert.test @@ -4,7 +4,7 @@ test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-conve Expenses:Unknown $10 Equity:Unknown $-10 = $20 -2011/12/12=2011/12/12 * ; +2011/12/12=2011/12/12 * Expenses:Unknown $10 Equity:Unknown end test |