diff options
| author | Lennart Weller <lhw@ring0.de> | 2016-05-11 11:08:13 +0000 |
|---|---|---|
| committer | Lennart Weller <lhw@ring0.de> | 2016-05-11 11:08:13 +0000 |
| commit | e8f1a1adb4ade311f79387714631e513d656c410 (patch) | |
| tree | a68d3924986690595910cfbb2488da1cadd5be1b | |
| parent | merged too many (diff) | |
| download | netdata-e8f1a1adb4ade311f79387714631e513d656c410.tar.xz netdata-e8f1a1adb4ade311f79387714631e513d656c410.zip | |
shitty merge
| -rw-r--r-- | debian/control | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/debian/control b/debian/control index edb277208..1c1bc1496 100644 --- a/debian/control +++ b/debian/control @@ -33,10 +33,6 @@ Description: real-time charts for system monitoring Package: netdata-data Architecture: all -<<<<<<< HEAD -======= -Multi-Arch: foreign ->>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d Depends: ${misc:Depends}, ${shlibs:Depends} Description: real-time charts for system monitoring Netdata is a daemon that collects data in realtime (per second) @@ -48,10 +44,6 @@ Description: real-time charts for system monitoring Package: netdata-plugins-nodejs Architecture: all -<<<<<<< HEAD -======= -Multi-Arch: foreign ->>>>>>> f2a27bcd6e16cafd4505fc84d9beac11cbcfdf8d Depends: nodejs, ${misc:Depends}, ${shlibs:Depends} Description: real-time charts for system monitoring Netdata is a daemon that collects data in realtime (per second) |