Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-04-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:allaryin/FairyFactions

Browse Source
This commit is contained in:
Ammon Lauritzen 2016-02-18 14:05:56 -06:00
commit 97608a6758
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LICENSE
View File

@ -199,4 +199,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
<<<<<<< HEAD
=======
>>>>>>> 57c122fddbe1562965b7ab0c79d2a082a196d8a5