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
:
CreateThread(function() | |
Citizen.InvokeNative(0x144da052257ae7d8, true) | |
print("ENABLED NETWORK ALLOW REMOTE SYNC OF LOCAL PLAYERS") | |
end) | |
function GetNearestPlayerToMe() | |
local players = GetActivePlayers() | |
local closestPlayer, closestDistance = nil, 100000 | |
local myPos = GetEntityCoords(PlayerPedId()) | |
local myPlayerId = PlayerId() |
Jenkins.instance.queue.items.findAll { !it.task.name.contains("Extenda") }.each { | |
println "Cancel ${it.task.name}" | |
Jenkins.instance.queue.cancel(it.task) | |
} | |
Jenkins.instance.items.each { | |
stopJobs(it) | |
} | |
def stopJobs(job) { | |
if (job in jenkins.branch.OrganizationFolder) { | |
// Git behaves well so no need to traverse it. |
This is a Cheat Sheet for interacting with the Mongo Shell ( mongo on your command line). This is for MongoDB Community Edition.
Mongo Manual can help you with getting started using the Shell.
FAQ for MongoDB Fundamentals and other FAQs can be found in the side-bar after visiting that link.
Some Jenkinsfile examples |
--[[The MIT License (MIT) | |
Copyright (c) 2017 IllidanS4 | |
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 |
e.g: tar -czvf name-of-archive.tar.gz /path/to/directory-or-file
<?php | |
function require_auth() { | |
$AUTH_USER = 'admin'; | |
$AUTH_PASS = 'admin'; | |
header('Cache-Control: no-cache, must-revalidate, max-age=0'); | |
$has_supplied_credentials = !(empty($_SERVER['PHP_AUTH_USER']) && empty($_SERVER['PHP_AUTH_PW'])); | |
$is_not_authenticated = ( | |
!$has_supplied_credentials || | |
$_SERVER['PHP_AUTH_USER'] != $AUTH_USER || | |
$_SERVER['PHP_AUTH_PW'] != $AUTH_PASS |
Citizen.CreateThread(function() | |
while true | |
do | |
-- These natives has to be called every frame. | |
SetVehicleDensityMultiplierThisFrame(0.0) | |
SetPedDensityMultiplierThisFrame(0.0) | |
SetRandomVehicleDensityMultiplierThisFrame(0.0) | |
SetParkedVehicleDensityMultiplierThisFrame(0.0) | |
SetScenarioPedDensityMultiplierThisFrame(0.0, 0.0) | |
prop_a4_pile_01 | |
prop_a4_sheet_01 | |
prop_a4_sheet_02 | |
prop_a4_sheet_03 | |
prop_a4_sheet_04 | |
prop_a4_sheet_05 | |
prop_abat_roller_static | |
prop_abat_slide | |
prop_acc_guitar_01 | |
prop_acc_guitar_01_d1 |