Fix conflict fix error
commitf35d2c307fcf623a02bc0fa4cdce43e15f0fd1a8
authorGerry Boland <gerry.boland@canonical.com>
dateTue 8 Jul 2014, 20:09 (12 years ago)
parent5088bd1
plugins/Unity/CMakeLists.txt+1−1
@@ -1,3 +1,3 @@
11add_subdirectory(Indicators)
22add_subdirectory(Launcher)
3−add_subdirectory(Shell)
3+add_subdirectory(Session)