From f1923a7b3504448a78217acccc708da73c0e6cef Mon Sep 17 00:00:00 2001
From: Alfredo Braunstein <abraunst@lyx.org>
Date: Mon, 13 Aug 2007 13:11:49 +0000
Subject: [PATCH] fix compilation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19499 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetNote.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 28c8048184..7e408255f7 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -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"
-- 
2.39.2