Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into TSheets-UI
  • Loading branch information
daros10 authored Mar 11, 2020
commit 443a78af3c00284f8c4ca1d91f5de67afbd94061
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# TimeTracker
# Time-Tracker-UI

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.4.
This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 9.0.4.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Run `ng serve` to run the app in a dev mode, after executing this command you can navigate to `http://localhost:4200/` to see the app working.
The app will automatically reload if you change anything in the source files.

## Code scaffolding

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"devDependencies": {
"@angular-devkit/build-angular": "^0.900.5",
"@angular/cli": "~9.0.4",
"@angular/compiler-cli": "~9.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

<app-sidebar>
<router-outlet></router-outlet>
</app-sidebar>
</app-sidebar>
1 change: 1 addition & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ import { ClockComponent } from './components/shared/clock/clock.component';
bootstrap: [AppComponent]
})
export class AppModule { }

2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
<script src="https://kit.fontawesome.com/76d0c245a1.js" crossorigin="anonymous"></script>
</body>

</html>
</html>
You are viewing a condensed version of this merge commit. You can view the full changes here.