Auto stash before merge of "develop" and "origin/develop"

5 years ago · 46490115ee
parent 99c91f20a4
commit 46490115ee
1 changed files with 0 additions and 2 deletions
--- a/src/lib/models/Friendship.ts
+++ b/src/lib/models/Friendship.ts
@ -11,7 +11,6 @@ export class Friendship extends Model<Friendship> {
     * The id of the first user
     */
    @ForeignKey(() => User)
-    @PrimaryKey
    @NotNull
    @Column({allowNull: false})
    public userId: number;
@ -20,7 +19,6 @@ export class Friendship extends Model<Friendship> {
     * The id of the second user
     */
    @ForeignKey(() => User)
-    @PrimaryKey
    @NotNull
    @Column({allowNull: false})
    public friendId: number;