mirror of
https://github.com/labwc/labwc.git
synced 2026-04-07 08:21:20 -04:00
Correct blundered merge conflict resolution
This commit is contained in:
parent
6ae186edc5
commit
bfd4364ba9
1 changed files with 0 additions and 5 deletions
|
|
@ -25,11 +25,6 @@
|
||||||
#include "theme.h"
|
#include "theme.h"
|
||||||
#include "view.h"
|
#include "view.h"
|
||||||
|
|
||||||
<<<<<<< master
|
|
||||||
|
|
||||||
#define COSMIC_WORKSPACES_VERSION 1
|
|
||||||
=======
|
|
||||||
>>>>>>> master
|
|
||||||
#define EXT_WORKSPACES_VERSION 1
|
#define EXT_WORKSPACES_VERSION 1
|
||||||
|
|
||||||
/* Internal helpers */
|
/* Internal helpers */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue