Skip to content

Commit

Permalink
fix wrong git conflict merge
Browse files Browse the repository at this point in the history
  • Loading branch information
karlnapf authored and vigsterkr committed Mar 10, 2016
1 parent 83ea9fe commit 28e761d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions examples/meta/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ IF(ENABLE_TESTING)
# ruby
IF (RubyModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/ruby)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ruby)
ENDIF()

# lua
IF (LuaModular AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/lua)
Expand Down

0 comments on commit 28e761d

Please sign in to comment.