Browse Source

resolve merge conflict

SBird1337 6 years ago
parent
commit
f3af74b4ad
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      sots-private

+ 1
- 1
sots-private

1
-Subproject commit 9781b1572914460b4f1afbccbf28155a87d5c8c5
1
+Subproject commit df1126bbc8e7e96c9b8c4b76ae7382f994076285