Stupid git merge hell. Fixing conflict markers
authorRyan Rix <ry@n.rix.si>
Sat, 30 Jan 2010 06:22:53 +0000 (22:22 -0800)
committerRyan Rix <ry@n.rix.si>
Sat, 30 Jan 2010 06:22:53 +0000 (22:22 -0800)
commit15a349249a5293b97bc826b992d2af6e6dcc6ff6
tree9c1e20f70362e914c49c434695538adabc69c6be
parenta16f73a73db1353c6b66d3dbd27e09c16e64f237
Stupid git merge hell. Fixing conflict markers
src/config/ignore_config.cpp
src/config/ignore_configui.ui