]> git.lyx.org Git - features.git/commit
This file failed to go in r38615 due to its still being in conflict.
authorRichard Heck <rgheck@comcast.net>
Sat, 7 May 2011 17:38:02 +0000 (17:38 +0000)
committerRichard Heck <rgheck@comcast.net>
Sat, 7 May 2011 17:38:02 +0000 (17:38 +0000)
commit6d6ca1e343a496093b495e9e78dbe5df7f821840
tree0283eb5a4629ea7384d93782144ef82be13a7e02
parent8f7c852b0f1a0d65eea9377ffcfecffdc68b1741
This file failed to go in r38615 due to its still being in conflict.

Why don't you get a warning about this in QtCreator?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38617 a592a061-630c-0410-9148-cb99ea01b6c8
src/Buffer.cpp