Skip to content
This repository has been archived by the owner on Feb 5, 2023. It is now read-only.

Commit

Permalink
fix after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
NikGurev committed May 18, 2021
1 parent a5982e2 commit 2025f28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"@typescript-eslint/type-annotation-spacing": "error",
"space-infix-ops": "error",
"object-curly-spacing": ["error", "always"],
"arrow-body-style": "error",
"arrow-body-style": "off",
"arrow-parens": ["off", "always"],
"brace-style": ["off", "off"],
"comma-dangle": "off",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { IUser } from '@data/models/user';
import { Time } from '@angular/common';
import { MatDialog } from '@angular/material/dialog';
import { UserStatus, UserStatusModel } from '@app/models/user-status.model';
import { UserStatusModel } from '@app/models/user-status.model';
import { DateType } from '@app/models/date.model';
import { employee, userResponse } from '../../mock';
import { employee } from '../../mock';
import { UserStatus } from '@data/api/user-service/models/user-status';
import { User } from '@app/models/user.model';
import { CommunicationInfo } from '@data/api/user-service/models/communication-info';
Expand Down Expand Up @@ -240,7 +240,7 @@ export class MainInfoComponent implements OnInit {
return { type: communication.type, value: communication.value };
});
} else {
return [];
return [];
};
}
}

0 comments on commit 2025f28

Please sign in to comment.