Skip to content
Snippets Groups Projects
Commit 90e1c7b1 authored by Sulverus's avatar Sulverus
Browse files

Merge branch 'gh-949'

parents bba28ca0 0ef16c98
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
debian/control
+ 3
− 0
View file @ 90e1c7b1
......@@ -20,6 +20,7 @@ Conflicts: tarantool-common (<< 1.5.3),
tarantool-lts-common,
tarantool-lts,
tarantool-lts-modules,
tarantool-lts-client,
tarantool-lts-postgresql-module,
tarantool-lts-mysql-module,
tarantool-lts-dev,
......@@ -49,6 +50,7 @@ Conflicts: tarantool-lts-common,
tarantool-lts-postgresql-module,
tarantool-lts-mysql-module,
tarantool-lts-dev,
tarantool-lts-client,
tarantool-dbg (<< 1.5.2),
tarantool-common (<< 1.6~),
tarantool-client (<< 1.6~),
......@@ -83,6 +85,7 @@ Conflicts: tarantool-lts-common,
tarantool-lts-modules,
tarantool-lts-postgresql-module,
tarantool-lts-mysql-module,
tarantool-lts-client,
tarantool-lts-dev,
tarantool-dbg (<< 1.5.2),
tarantool-common (<< 1.6~),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment