Skip to content

Commit

Permalink
build: resolve merge conflicts from master
Browse files Browse the repository at this point in the history
  • Loading branch information
gr2m committed Feb 6, 2020
2 parents 09bc0de + f62b1ee commit 6e79bf6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Octokit } from "@octokit/core";
import { Deprecation } from "deprecation";

import ENDPOINTS from "./generated/endpoints";
import { VERSION } from "./version";
Expand Down

0 comments on commit 6e79bf6

Please sign in to comment.