summaryrefslogtreecommitdiff
path: root/tests/ephy-history-test.c
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@gnome.org>2016-10-07 19:33:08 -0500
committerMichael Catanzaro <mcatanzaro@gnome.org>2016-10-07 19:33:08 -0500
commitd71e1687953dca9787c3763928a88d7397081b94 (patch)
treed9fad2d1e70941097a8cda8c37fb30900cdbd90b /tests/ephy-history-test.c
parent8846eb13942a62f36262ad61c40d11e62c46f441 (diff)
downloadepiphany-d71e1687953dca9787c3763928a88d7397081b94.tar.gz
Fix build after mishandling merge conflict
Diffstat (limited to 'tests/ephy-history-test.c')
0 files changed, 0 insertions, 0 deletions