It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.
- Update the
master
branch with the latest changes:git checkout master git pull
- Merge your feature branch into
master
:
D3
chart currently displayed on metacat UI// Test object recreate speed on large objects vs small objects | |
function createObject(propsCount) { | |
const obj = {}; | |
for (let i = 0; i < propsCount; i += 1) { | |
obj[`p${i}`] = i; | |
} | |
return obj; | |
} |
sudo service apport stop
sudo rm -f /var/crash/*
sudo apt-get remove apport -y
MIT License | |
Copyright (c) [2017] [DIGI-CORP] | |
Permission is hereby granted, free of charge, to any person obtaining a copy | |
of this software and associated documentation files (the "Software"), to deal | |
in the Software without restriction, including without limitation the rights | |
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
copies of the Software, and to permit persons to whom the Software is | |
furnished to do so, subject to the following conditions: |
#!/bin/bash | |
# This script will extract the certificate and key from an .ovpn file | |
# into their own files, which makes it possible to use them to configure | |
# the VPN using Ubuntu's network manager | |
# Usage example: | |
# >> ovpnconvert username.dev.ovpn | |
# You can keep following these instructions here: |
// Put me under ./src | |
module.exports = { | |
extends: 'react-app', | |
rules: { | |
eqeqeq: 'off' | |
} | |
} |
So consider we have Logger class. And also we have a LoggerInContext class which extends Logger. And Logger has factory method to create new LoggerInContext instances.
// logger.ts
import { LoggerInContext } from './logger-in-context';
export class Logger {