[rkward-cvs] SF.net SVN: rkward-code:[4688] trunk/rkward/rkward/windows/rkwindowcatcher. h

[tfry at users.sf.net]

Revision: 4688
          http://sourceforge.net/p/rkward/code/4688
Author:   tfry
Date:     2013-04-11 12:01:29 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Fix merge bug.

Modified Paths:
--------------
    trunk/rkward/rkward/windows/rkwindowcatcher.h

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.h
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.h	2013-04-11 11:57:23 UTC (rev 4687)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.h	2013-04-11 12:01:29 UTC (rev 4688)
@@ -161,11 +161,8 @@
 private slots:
 	void doEmbed ();
 private:
-<<<<<<< .working
 	void forceClose ();
-=======
 	void commonInit (int device_number);
->>>>>>> .merge-right.r4686
 	void reEmbed ();
 	void rCommandDone (RCommand *command);
 	friend class RKCaughtX11WindowPart;	// needs access to the actions