diff options
| author | Camil Staps | 2015-06-10 13:16:16 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 13:16:16 +0200 |
| commit | dd9c36491ab017795a71bdc4624281b65dcabd11 (patch) | |
| tree | a99376c8d15be4f1bb6b66aa80600c5011c74a18 /settings.gradle | |
| parent | IT WORKS (diff) | |
| parent | Aligned (EDIT) to the right (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedSorterTrainer.java
app/src/main/java/org/rssin/neurons/FeedSorter.java
app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java
app/src/main/java/org/rssin/neurons/NeuralNetwork.java
app/src/main/java/org/rssin/rssin/SortedFeedItemContainer.java
Diffstat (limited to 'settings.gradle')
0 files changed, 0 insertions, 0 deletions