jgilfelt

/*
 * Copyright (C) 2016 Jeff Gilfelt.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software

nickbutcher

<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2015 The Android Open Source Project

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0

jt

If someone forks a gist and you'd like to merge their changes. Do this:

1. clone your repo, I use the name of the gist

    git clone git://gist.github.com/1163142.git gist-1163142
   

2. add a remote for the forked gist, I'm using the name of my fellow developer

    git remote add aaron git://gist.github.com/1164196.git