krlhBlupine/iBioSim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of

Browse source 
https://github.com/MyersResearchGroup/iBioSim.git

Conflicts:
	LICENSE.txt
This commit is contained in:
Tramy Nguyen 2017-02-28 14:27:56 -07:00
commit 7dad1691ac
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
LICENSE.txt
View file

@ -199,4 +199,8 @@
distributed under the License is distributed on an "AS IS" BASIS,
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
limitations under the License.
=======
limitations under the License.
>>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git