Skip to content

Commit 558e462

Browse files
kuehleinkuehlein
committed
fix: resolve merge conflicts
2 parents d0cf707 + 2db864e commit 558e462

31 files changed

+420549
-710
lines changed

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
node_modules
2-
chrome/js/*
2+
chrome/js/app.bundle.js
3+
chrome/js/app.bundle.js.map
4+
chrome/js/popup.bundle.js
5+
chrome/js/popup.bundle.js.map
36
secrets.js
47
.DS_Store
58
npm-debug.log
69
yarn-error.log
7-
8-
910
build/
1011
dev/

‎chrome/extension/background.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎chrome/extension/background/badge.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎chrome/extension/background/contextMenus.js

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎chrome/extension/background/inject.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎chrome/extension/inject.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎chrome/js/toggle.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function toggle()
2+
{
3+
4+
var toggle = document.getElementById("toggle");
5+
return function() {
6+
if(chrome.management.setEnabled === 0)
7+
chrome.management.setEnabled = 1
8+
else
9+
chrome.management.setEnabled = 0;
10+
}
11+
12+
}

‎chrome/style/drawer.less

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎chrome/views/popup.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
</head>
77
<body>
88
<div id="popup"></div>
9-
<script defer src="../js/popup.bundle.js"></script>
9+
<script defer src="../js/popup.bundle.js"></script>
1010
</body>
1111
</html>

0 commit comments

Comments
 (0)