fix compilation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19499 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Alfredo Braunstein 2007-08-13 13:11:49 +00:00
parent 2bd998c29e
commit f1923a7b35

View File

@ -17,11 +17,8 @@
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
<<<<<<< .mine
#include "BufferParams.h"
=======
#include "Counters.h"
>>>>>>> .r19497
#include "Cursor.h"
#include "debug.h"
#include "DispatchResult.h"